From f1842d21ffd556da73ab57a7e0fcf08e9a3a5878 Mon Sep 17 00:00:00 2001
From: Michael Green <84688932+michael-j-green@users.noreply.github.com>
Date: Tue, 11 Jul 2023 22:31:08 +1000
Subject: [PATCH] Docker and Docker-Compose updates (#13)

* feat: updated docker-compose files to pull an image from docker hub
---
 .github/workflows/BuildDockerOnTag.yml | 34 ++++++++++++++++++++++
 Dockerfile                             |  2 +-
 docker-compose-build.yml               | 39 ++++++++++++++++++++++++++
 docker-compose.yml                     |  3 +-
 4 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/BuildDockerOnTag.yml
 create mode 100644 docker-compose-build.yml

diff --git a/.github/workflows/BuildDockerOnTag.yml b/.github/workflows/BuildDockerOnTag.yml
new file mode 100644
index 0000000..a4963cd
--- /dev/null
+++ b/.github/workflows/BuildDockerOnTag.yml
@@ -0,0 +1,34 @@
+name: Build Docker Image on New Tag
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64 #,linux/arm64
+          push: true
+          tags: gaseousgames/gaseousserver:latest,gaseousgames/gaseousserver:${{ github.ref_name}}
diff --git a/Dockerfile b/Dockerfile
index 507340c..8c3a6e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ COPY . ./
 # Restore as distinct layers
 RUN dotnet restore "gaseous-server/gaseous-server.csproj"
 # Build and publish a release
-RUN dotnet publish "gaseous-server/gaseous-server.csproj" -c Release -o out
+RUN dotnet publish "gaseous-server/gaseous-server.csproj" --use-current-runtime --self-contained false -c Release -o out
 
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:7.0
diff --git a/docker-compose-build.yml b/docker-compose-build.yml
new file mode 100644
index 0000000..0c1445d
--- /dev/null
+++ b/docker-compose-build.yml
@@ -0,0 +1,39 @@
+version: '2'
+services:
+  gaseous-server:
+    container_name: gaseous-server
+    build:
+      context: ./
+    restart: unless-stopped
+    networks:
+      - gaseous
+    depends_on:
+      - gsdb
+    ports:
+      - 5198:80
+    volumes:
+      - gs:/root/.gaseous-server
+    environment:
+      - dbhost=gsdb
+      - dbuser=root
+      - dbpass=gaseous
+      - igdbclientid=<clientid>
+      - igdbclientsecret=<clientsecret>
+  gsdb:
+    container_name: gsdb
+    image: mysql:8
+    restart: unless-stopped
+    networks:
+      - gaseous
+    volumes:
+      - gsdb:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=gaseous
+      - MYSQL_USER=gaseous
+      - MYSQL_PASSWORD=gaseous
+networks:
+  gaseous:
+    driver: bridge
+volumes:
+  gs:
+  gsdb:
diff --git a/docker-compose.yml b/docker-compose.yml
index 0c1445d..961a051 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,7 @@ version: '2'
 services:
   gaseous-server:
     container_name: gaseous-server
-    build:
-      context: ./
+    image: gaseousgames/gaseousserver:latest
     restart: unless-stopped
     networks:
       - gaseous