Merge branch 'master' of https://github.com/cmu-sei/GHOSTS

# Conflicts:
#	src/Ghosts.Api/docker-compose.yml

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Make API Container
 
 on:
   release:
@@ -9,27 +9,42 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+
+      # Extract tag name
+      - name: Extract tag name
+        id: tag_name
+        run: echo "##[set-output name=tag;]$(echo ${GITHUB_REF#refs/tags/})"
+        shell: bash
+
       - name: Build and push Docker images
-        uses: docker/build-push-action@v1.1.0
+        uses: docker/build-push-action@v2  # Updated to v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: dustinupdyke/ghosts
-          tag_with_ref: true
-          push: ${{ startsWith(github.ref, 'refs/tags/') }}
-          path: src
-          dockerfile: src/Dockerfile-api
+          tags: dustinupdyke/ghosts:${{ steps.tag_name.outputs.tag }}
+          push: true
+          context: src
+          file: src/Dockerfile-api
+
   buildcmusei:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+
+      # Extract tag name
+      - name: Extract tag name
+        id: tag_name
+        run: echo "##[set-output name=tag;]$(echo ${GITHUB_REF#refs/tags/})"
+        shell: bash
+
       - name: Build and push Docker images
-        uses: docker/build-push-action@v1.1.0
+        uses: docker/build-push-action@v2  # Updated to v2
         with:
           username: ${{ secrets.BOT_USERNAME }}
           password: ${{ secrets.BOT_PASSWORD }}
           repository: cmusei/ghosts
-          tag_with_ref: true
-          push: ${{ startsWith(github.ref, 'refs/tags/') }}
-          path: src
-          dockerfile: src/Dockerfile-api
+          tags: cmusei/ghosts:${{ steps.tag_name.outputs.tag }}
+          push: true
+          context: src
+          file: src/Dockerfile-api

src/Ghosts.Api/docker-compose.yml

@@ -1,6 +1,5 @@
 # docker-compose up -d
 # -f compose-api.yml (if you want a custom file)
-# The Grafana volume mounts assume the directory structure matches the git repository
 
 version: '3.2'
 networks:
@@ -55,5 +54,3 @@ services:
     restart: always
     volumes:
       - ./g_data:/var/lib/grafana
-
-