improve: clean and update docker (#716)

Docker was not working very well, so I made a cleanup and update the Dockerfile and also the startup script to work with the current code. Also made some improvements to the script that docker uses to start canary.
opentibiabr · Jan 12, 2023 · ccb2474 · ccb2474
1 parent d1ac9a7
commit ccb2474
Show file tree

Hide file tree

Showing 13 changed files with 275 additions and 451 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -9,7 +9,7 @@ on:
       - main
 
 jobs:
-  docker:
+  build_docker_x86:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -27,20 +27,20 @@ jobs:
         uses: gittools/actions/gitversion/execute@v0.9.15
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.1.0
+        uses: docker/setup-buildx-action@v2
         with:
           install: true
 
       - name: Cache Docker layers
         uses: actions/cache@main
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          key: ${{ runner.os }}-x86-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-
+            ${{ runner.os }}-x86-
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -50,7 +50,7 @@ jobs:
         if: ${{ github.event_name == 'pull_request' }}
         uses: docker/build-push-action@v3.2.0
         with:
-          file: docker/server/Dockerfile
+          file: docker/Dockerfile.x86
           tags: ghcr.io/${{ github.repository }}:${{ steps.gitversion.outputs.semVer }}
           cache-from: type=gha, scope=${{ github.workflow }}
           cache-to: type=gha, scope=${{ github.workflow }}
@@ -60,7 +60,7 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         uses: docker/build-push-action@v3.2.0
         with:
-          file: docker/server/Dockerfile
+          file: docker/Dockerfile.x86
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ steps.gitversion.outputs.semVer }}
           cache-from: type=gha, scope=${{ github.workflow }}
@@ -70,10 +70,40 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         run: echo ${{ steps.docker_build.outputs.digest }}
 
-      # # Temp fix
-      # # https://github.com/docker/build-push-action/issues/252
-      # # https://github.com/moby/buildkit/issues/1896
-      # - name: Move cache
-      #   run: |
-      #     rm -rf /tmp/.buildx-cache
-      #     mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+  build_docker_arm:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Install GitVersion
+        uses: gittools/actions/gitversion/setup@v0.9.15
+        with:
+          versionSpec: '5.x'
+
+      - name: Determine Version
+        id: gitversion
+        uses: gittools/actions/gitversion/execute@v0.9.15
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+
+      - name: Cache Docker layers
+        uses: actions/cache@main
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-arm-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-arm-
+
+      - name: Build
+        uses: docker/build-push-action@v3.2.0
+        with:
+          file: docker/Dockerfile.arm
+          tags: ghcr.io/${{ github.repository }}:${{ steps.gitversion.outputs.semVer }}
+          cache-from: type=gha, scope=${{ github.workflow }}
+          cache-to: type=gha, scope=${{ github.workflow }}
diff --git a/docker/.gitignore b/docker/.gitignore
diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm
@@ -0,0 +1,49 @@
+# Stage 1: Download all dependencies
+FROM ubuntu:22.04 AS dependencies
+
+RUN apt-get update && apt-get install -y --no-install-recommends cmake git \
+	unzip build-essential ca-certificates curl zip unzip tar \
+	pkg-config ninja-build autoconf automake libtool libluajit-5.1-dev libluajit-5.1-common \
+	&& apt-get clean \
+	&& rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt
+RUN git clone https://github.com/microsoft/vcpkg --depth=1 \
+	&& ./vcpkg/bootstrap-vcpkg.sh
+
+WORKDIR /opt/vcpkg
+COPY vcpkg.json /opt/vcpkg/
+RUN VCPKG_FORCE_SYSTEM_BINARIES=1 /opt/vcpkg/vcpkg --feature-flags=binarycaching,manifests,versions install
+
+# Stage 2: create build
+FROM dependencies AS build
+
+COPY . /srv/
+WORKDIR /srv
+
+RUN export VCPKG_ROOT=/opt/vcpkg/ && VCPKG_FORCE_SYSTEM_BINARIES=1 cmake --preset linux-release && cmake --build --preset linux-release
+
+# Stage 3: load data and execute
+FROM ubuntu:22.04
+
+VOLUME [ "/data" ]
+
+COPY --from=build /srv/build/linux-release/bin/canary /bin/canary
+COPY LICENSE *.sql key.pem /canary/
+COPY data /canary/data
+COPY data-canary /canary/data-canary
+COPY data-otservbr-global /canary/data-otservbr-global
+COPY config.lua.dist /canary/config.lua
+
+WORKDIR /canary
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	mariadb-client libluajit-5.1-dev libluajit-5.1-common wget curl \
+	&& apt-get clean \
+	&& rm -rf /var/lib/apt/lists/*
+
+COPY docker/data/01-test_account.sql 01-test_account.sql
+COPY docker/data/02-test_account_players.sql 02-test_account_players.sql
+COPY docker/data/start.sh start.sh
+
+ENTRYPOINT ["/canary/start.sh"]
diff --git a/docker/server/Dockerfile → docker/Dockerfile.x86 b/docker/server/Dockerfile → docker/Dockerfile.x86
@@ -8,8 +8,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends cmake git \
 	&& rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt
-RUN git clone https://github.com/microsoft/vcpkg --depth=1
-RUN ./vcpkg/bootstrap-vcpkg.sh
+RUN git clone https://github.com/microsoft/vcpkg --depth=1 \
+	&& ./vcpkg/bootstrap-vcpkg.sh
 
 WORKDIR /opt/vcpkg
 COPY vcpkg.json /opt/vcpkg/
@@ -25,19 +25,24 @@ RUN export VCPKG_ROOT=/opt/vcpkg/ && cmake --preset linux-release && cmake --bui
 
 # Stage 3: load data and execute
 FROM ubuntu:22.04
+VOLUME [ "/data" ]
 
 COPY --from=build /srv/build/linux-release/bin/canary /bin/canary
 COPY LICENSE *.sql key.pem /canary/
 COPY data /canary/data
+COPY data-canary /canary/data-canary
+COPY data-otservbr-global /canary/data-otservbr-global
 COPY config.lua.dist /canary/config.lua
 
 WORKDIR /canary
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-	mariadb-client \
+	mariadb-client curl \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY docker/server/start.sh start.sh
+COPY docker/data/01-test_account.sql 01-test_account.sql
+COPY docker/data/02-test_account_players.sql 02-test_account_players.sql
+COPY docker/data/start.sh start.sh
 
 ENTRYPOINT ["/canary/start.sh"]
diff --git a/docker/data/download-myaac.sh b/docker/data/download-myaac.sh
diff --git a/docker/data/login.py b/docker/data/login.py