Use same name for build stage and image tag

Plus get rid of one obsolete step in Githhub workflow
This commit is contained in:
roschaefer 2020-06-08 16:36:00 +02:00
parent aa7e30f287
commit 05cb9bd6ec
4 changed files with 8 additions and 15 deletions

View File

@ -14,13 +14,13 @@ jobs:
with: with:
submodules: recursive submodules: recursive
- name: Build neo4j base image - name: Build neo4j image
uses: docker/build-push-action@v1.1.0 uses: docker/build-push-action@v1.1.0
with: with:
repository: schoolsinmotion/neo4j repository: schoolsinmotion/neo4j
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
tags: bare tags: latest
path: Human-Connection/neo4j/ path: Human-Connection/neo4j/
- name: Build backend base image - name: Build backend base image
uses: docker/build-push-action@v1.1.0 uses: docker/build-push-action@v1.1.0
@ -28,7 +28,8 @@ jobs:
repository: schoolsinmotion/backend repository: schoolsinmotion/backend
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
tags: bare tags: build-and-test
target: build-and-test
path: Human-Connection/backend/ path: Human-Connection/backend/
- name: Build webapp base image - name: Build webapp base image
uses: docker/build-push-action@v1.1.0 uses: docker/build-push-action@v1.1.0
@ -36,17 +37,10 @@ jobs:
repository: schoolsinmotion/webapp repository: schoolsinmotion/webapp
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
tags: bare tags: build-and-test
target: build-and-test
path: Human-Connection/webapp/ 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 - name: Build backend customized image
uses: docker/build-push-action@v1.1.0 uses: docker/build-push-action@v1.1.0
with: with:

View File

@ -1 +1 @@
FROM schoolsinmotion/backend:bare FROM schoolsinmotion/backend:build-and-test

View File

@ -1 +0,0 @@
FROM schoolsinmotion/neo4j:bare

View File

@ -1,3 +1,3 @@
FROM schoolsinmotion/webapp:bare FROM schoolsinmotion/webapp:build-and-test
COPY static/ static/ COPY static/ static/
COPY constants/ constants/ COPY constants/ constants/