fix

Till0196 · Jan 18, 2025 · 7021b51 · 7021b51
1 parent 93316bd
commit 7021b51
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/.github/workflows/build-sharelatex-image.yml b/.github/workflows/build-sharelatex-image.yml
@@ -52,28 +52,42 @@ jobs:
       - name: sharelatex base image build (arm64 only)
         if: ${{ matrix.platform == 'linux/arm64' }}
         run: |
-          git clone https://github.com/overleaf/overleaf --depth 1 --recursive
-          docker build \
-            --build-arg BUILDKIT_INLINE_CACHE=1 \
-            --progress=plain \
-            --file overleaf/server-ce/Dockerfile-base \
-            --pull \
-            --tag sharelatex/sharelatex-base:latest \
-            overleaf
-          docker build \
-            --build-arg BUILDKIT_INLINE_CACHE=1 \
-            --progress=plain \
-            --file overleaf/server-ce/Dockerfile \
-            --tag sharelatex:latest \
-            overleaf
+          git clone https://github.com/overleaf/overleaf --depth 1 --recursive sharelatex/overleaf
+
+      - name: sharelatex-base Build and push (arm64 only)
+        if: ${{ matrix.platform == 'linux/arm64' }}
+        uses: docker/build-push-action@v5
+        with:
+          context: ./sharelatex/overleaf
+          file: sharelatex/overleaf/server-ce/Dockerfile-base
+          push: true
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          outputs: type=image,name=${{ env.REGISTRY_IMAGE }}-base,name-canonical=true,push=true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: sharelatex Build and push (arm64 only)
+        if: ${{ matrix.platform == 'linux/arm64' }}
+        uses: docker/build-push-action@v5
+        with:
+          context: ./sharelatex/overleaf
+          file: sharelatex/overleaf/server-ce/Dockerfile
+          build-args: |
+            OVERLEAF_BASE_TAG=${{ env.REGISTRY_IMAGE }}-base:latest
+          push: true
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          outputs: type=image,name=${{ env.REGISTRY_IMAGE }}-arm64,name-canonical=true,push=true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Build and push
         id: build
         uses: docker/build-push-action@v5
         with:
           context: ./sharelatex
           file: sharelatex/Dockerfile
-          load: true
           push: true
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}

diff --git a/sharelatex/Dockerfile b/sharelatex/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH
 FROM sharelatex/sharelatex:5 AS base-amd64
 
 # arm64の場合、DockerHubにarm64向けイメージが存在しないため事前にビルドしたベースイメージを利用
-FROM sharelatex:latest AS base-arm64
+FROM ghcr.io/till0196/sharelatex-arm64:latest AS base-arm64
 
 # アーキテクチャに応じてベースイメージを選択
 FROM base-${TARGETARCH}