arm64

sredevopsorg · Jul 25, 2023 · c8650bf · c8650bf
1 parent 398f8b7
commit c8650bf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/build-custom-image.yaml b/.github/workflows/build-custom-image.yaml
@@ -21,7 +21,7 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         platform:
           - linux/amd64
@@ -43,6 +43,10 @@ jobs:
             echo "GHOST_VERSION=$(curl -s https://api.github.com/repos/tryghost/ghost/releases/latest | jq '.name' | sed 's/\"//g')" >> $GITHUB_OUTPUT
             echo "MANUAL_TAG=main" >> $GITHUB_OUTPUT
           fi
+
+      - name: Show GHOST_VERSION
+        run: |
+          echo ${{ steps.versions.outputs.GHOST_VERSION }}
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -86,11 +90,10 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v4
         with:
-          context: ${{ github.workspace }}
-          file: ./Dockerfile
+          context: .
           platforms: ${{ matrix.platform }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}          
           build-args: |
-            GHOST_VERSION=${{ steps.versions.outputs.GHOST_VERSION }}
+            GHOST_VERSION=${{ steps.versions.outputs.GHOST_VERSION }}
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ ENV GOSU_VERSION 1.16
 RUN set -eux; \
     # save list of currently installed packages for later so we can clean up
     savedAptMark="$(apt-mark showmanual)"; \
-    apt-get update; \
+    apt-get update && apt-get upgrade -y; \
     apt-get install -y --no-install-recommends ca-certificates gnupg wget; \
     rm -rf /var/lib/apt/lists/*; \
     \
@@ -57,7 +57,7 @@ RUN set -eux; \
 	installCmd='gosu node ghost install "$GHOST_VERSION" --db mysql --dbhost mysql --no-prompt --no-stack --no-setup --dir "$GHOST_INSTALL"'; \
 	if ! eval "$installCmd"; then \
 		aptPurge=1; \
-		apt-get update; \
+		apt-get update && apt-get upgrade -y; \
 		apt-get install -y --no-install-recommends g++ make python3; \
 		eval "$installCmd"; \
 	fi; \
@@ -94,13 +94,14 @@ RUN set -eux; \
 	for package in $packages; do \
 		installCmd='gosu node yarn add "$package" --force'; \
 		if ! eval "$installCmd"; then \
-# must be some non-amd64 architecture pre-built binaries aren't published for, so let's install some build deps and do-it-all-over-again
+			# must be some non-amd64 architecture pre-built binaries aren't published for, so let's install some build deps and do-it-all-over-again
 			aptPurge=1; \
-			apt-get update; \
+			apt-get update && apt-get upgrade -y; \
 			apt-get install -y --no-install-recommends g++ make python3; \
 			case "$package" in \
 				# TODO sharp@*) apt-get install -y --no-install-recommends libvips-dev ;; \
-				sharp@*) echo >&2 "sorry: libvips 8.10 in Debian bullseye is not new enough (8.12.2+) for sharp 0.30 😞"; continue ;; \
+				sharp@*) apt-get install -y --no-install-recommends libvips-dev ;; \
+				# sharp@*) echo >&2 "sorry: libvips 8.10 in Debian bullseye is not new enough (8.12.2+) for sharp 0.30 😞"; continue ;; \
 			esac; \
 			\
 			eval "$installCmd --build-from-source"; \