fix: arm images push

rluetzner · Jan 18, 2022 · 02c6ee0 · 02c6ee0
1 parent dd8a1c7
commit 02c6ee0
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 57 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,6 +2,9 @@ FROM eclipse-temurin:11.0.13_8-jre-focal
 
 WORKDIR app
 
+ARG TARGETPLATFORM
+ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
+
 ARG DEPENDENCY=build/dependency
 COPY ${DEPENDENCY}/dependencies/ ./
 COPY ${DEPENDENCY}/spring-boot-loader/ ./
@@ -13,21 +16,30 @@ ENV JELU_FILES_DIR="/files/"
 ENV JELU_METADATA_CALIBRE_PATH="/calibre/fetch-ebook-metadata"
 ENV LC_ALL=en_US.UTF-8
 
-RUN apt-get update && apt-get install --no-install-recommends --yes wget xz-utils \
-                                                         xdg-utils \
-                                                         libxcb-xinerama0 \
-                                                         libxcb-icccm4 \
-                                                         libxcb-image0 \
-                                                         libxcb-keysyms1 \
-                                                         libxcb-render-util0 \
-                                                         libxcb-randr0 \
-                                                         qt5-default \
-                                                         && apt-get clean \
-                                                         && rm -rf /var/lib/apt/lists/* \
-    && wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin install_dir=/ isolated=y \
-    && curl https://www.mobileread.com/forums/attachment.php\?attachmentid\=182200\&d\=1641360812 > goodreads.zip \
-    && /calibre/calibre-customize --add-plugin goodreads.zip \
-    && rm goodreads.zip
+RUN echo target platform $TARGETPLATFORM
+
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ] ; then \
+      apt-get update && apt-get install --no-install-recommends --yes wget xz-utils \
+      xdg-utils \
+      libxcb-xinerama0 \
+      libxcb-icccm4 \
+      libxcb-image0 \
+      libxcb-keysyms1 \
+      libxcb-render-util0 \
+      libxcb-randr0 \
+      qt5-default \
+      && apt-get clean \
+      && rm -rf /var/lib/apt/lists/* \
+      && wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin install_dir=/ isolated=y \
+      && curl https://www.mobileread.com/forums/attachment.php\?attachmentid\=182200\&d\=1641360812 > goodreads.zip \
+      && /calibre/calibre-customize --add-plugin goodreads.zip \
+      && rm goodreads.zip; \
+  else \
+      apt-get update && apt-get install --no-install-recommends --yes calibre \
+      && curl https://www.mobileread.com/forums/attachment.php\?attachmentid\=182200\&d\=1641360812 > goodreads.zip \
+      && calibre-customize --add-plugin goodreads.zip \
+      && rm goodreads.zip; \
+  fi
 
 ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher", "--spring.config.additional-location=optional:file:/config/"]
 EXPOSE 11111
diff --git a/Dockerfile-arm b/Dockerfile-arm
diff --git a/ci/docker-common.sh b/ci/docker-common.sh
@@ -3,9 +3,7 @@
 # 2: channel
 
 export DOCKER_CLI_EXPERIMENTAL=enabled
-PLATFORMS=linux/amd64
-
-ARM_PLATFORMS=linux/arm/v7,linux/arm64/v8
+PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64/v8
 
 if [ -z "$2" ]; then
     DOCKER_CHANNEL="latest"

diff --git a/ci/prepare-dockerhub.sh b/ci/prepare-dockerhub.sh
@@ -15,11 +15,3 @@ docker buildx build \
     --tag wabayang/jelu:$DOCKER_CHANNEL \
     --tag wabayang/jelu:$1 \
     --file ./Dockerfile .
-
-# build arm
-docker buildx build \
-    --platform $ARM_PLATFORMS \
-    --cache-from wabayang/jelu:$DOCKER_CHANNEL \
-    --tag wabayang/jelu:$DOCKER_CHANNEL \
-    --tag wabayang/jelu:$1 \
-    --file ./Dockerfile-arm .
diff --git a/ci/publish-dockerhub.sh b/ci/publish-dockerhub.sh
@@ -8,16 +8,8 @@ source "$(dirname "$0")/docker-common.sh" $1 $2
 # Push docker images (built previously)
 docker buildx build \
     --platform $PLATFORMS \
-    --tag wabayang/jelu:$DOCKER_CHANNEL \
-    --tag wabayang/jelu:$1 \
-    --file ./Dockerfile . \
-    --push
-
-# push arm images
-docker buildx build \
-    --platform $ARM_PLATFORMS \
     --cache-from wabayang/jelu:$DOCKER_CHANNEL \
     --tag wabayang/jelu:$DOCKER_CHANNEL \
     --tag wabayang/jelu:$1 \
-    --file ./Dockerfile-arm . \
+    --file ./Dockerfile . \
     --push