Dockerize Upgrade + Proper ARM Support

dbpolito · dbpolito · commit db7a0974908d · 2025-04-29T13:16:32.000-03:00
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -3,6 +3,7 @@ name: CI/CD
 on:
   push:
   workflow_dispatch:
+  pull_request:
   schedule:
     - cron: '0 0 * * 0'
 
diff --git a/8.0-prod/Dockerfile b/8.0-prod/Dockerfile
@@ -20,7 +20,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -21,7 +21,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/8.1-prod/Dockerfile b/8.1-prod/Dockerfile
@@ -20,7 +20,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -21,7 +21,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/8.2-prod/Dockerfile b/8.2-prod/Dockerfile
@@ -20,7 +20,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -21,7 +21,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/8.3-prod/Dockerfile b/8.3-prod/Dockerfile
@@ -20,7 +20,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/8.3/Dockerfile b/8.3/Dockerfile
@@ -21,7 +21,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/8.4-prod/Dockerfile b/8.4-prod/Dockerfile
@@ -20,7 +20,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/8.4/Dockerfile b/8.4/Dockerfile
@@ -21,7 +21,8 @@ WORKDIR /app
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php
@@ -23,7 +23,8 @@
 RUN adduser -D -u 1337 kool \
     && addgroup kool www-data \
     # dockerize
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && DOCKERIZE_ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
+    && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${DOCKERIZE_ARCH}-v0.9.3.tar.gz" | tar xz \
     && mv dockerize /usr/local/bin/dockerize \
     # deps
     && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
