diff --git a/.github/workflows/spring-cd.yml b/.github/workflows/spring-cd.yml index 4fd4c5f0..0ccfb160 100644 --- a/.github/workflows/spring-cd.yml +++ b/.github/workflows/spring-cd.yml @@ -2,10 +2,8 @@ name: Deploy on PR Merged to develop on: pull_request: - branches: - - develop - types: - - closed + types: [closed] + branches: [develop] jobs: build: diff --git a/.github/workflows/spring-ci.yaml b/.github/workflows/spring-ci.yaml index 4ed83274..998196a4 100644 --- a/.github/workflows/spring-ci.yaml +++ b/.github/workflows/spring-ci.yaml @@ -3,8 +3,6 @@ name: Spring CI on: push: branches: [ "develop" ] - pull_request: - branches: [ "develop" ] jobs: build: diff --git a/docker-compose.yaml b/docker-compose.yaml index 03025d8b..06e83f6a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,9 +6,11 @@ services: - web-net ports: - 8080:8080 + postgres: image: postgres:15 container_name: my_postgres + restart: always networks: - web-net ports: @@ -30,4 +32,4 @@ services: networks: web-net: - external: true \ No newline at end of file + driver: bridge \ No newline at end of file