From 05cb9bd6ec8cb982a0c07be06154c0e7dbbee744 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Mon, 8 Jun 2020 16:36:00 +0200 Subject: [PATCH] Use same name for build stage and image tag Plus get rid of one obsolete step in Githhub workflow --- .github/workflows/cd.yml | 18 ++++++------------ backend/Dockerfile | 2 +- neo4j/Dockerfile | 1 - webapp/Dockerfile | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 neo4j/Dockerfile diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 922279e..d1d77a2 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -14,13 +14,13 @@ jobs: with: submodules: recursive - - name: Build neo4j base image + - name: Build neo4j image uses: docker/build-push-action@v1.1.0 with: repository: schoolsinmotion/neo4j username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - tags: bare + tags: latest path: Human-Connection/neo4j/ - name: Build backend base image uses: docker/build-push-action@v1.1.0 @@ -28,7 +28,8 @@ jobs: repository: schoolsinmotion/backend username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - tags: bare + tags: build-and-test + target: build-and-test path: Human-Connection/backend/ - name: Build webapp base image uses: docker/build-push-action@v1.1.0 @@ -36,17 +37,10 @@ jobs: repository: schoolsinmotion/webapp username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - tags: bare + tags: build-and-test + target: build-and-test path: Human-Connection/webapp/ - - name: Build neo4j customized image - uses: docker/build-push-action@v1.1.0 - with: - repository: schoolsinmotion/neo4j - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - tags: latest - path: neo4j/ - name: Build backend customized image uses: docker/build-push-action@v1.1.0 with: diff --git a/backend/Dockerfile b/backend/Dockerfile index 860cb52..53874d7 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1 +1 @@ -FROM schoolsinmotion/backend:bare +FROM schoolsinmotion/backend:build-and-test diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile deleted file mode 100644 index bb20ebc..0000000 --- a/neo4j/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM schoolsinmotion/neo4j:bare diff --git a/webapp/Dockerfile b/webapp/Dockerfile index d3cd591..44f9841 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -1,3 +1,3 @@ -FROM schoolsinmotion/webapp:bare +FROM schoolsinmotion/webapp:build-and-test COPY static/ static/ COPY constants/ constants/