Use same name for build stage and image tag

Plus get rid of one obsolete step in Githhub workflow

.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:

backend/Dockerfile

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

neo4j/Dockerfile

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

webapp/Dockerfile

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