Add arm64 support for alpine ext images (#118)

Fix issue #117
floryn90 · Jun 22, 2024 · e6a484c · e6a484c
2 parents 60de3eb + da622ce
commit e6a484c
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ test: test-docsy test-docuapi
 
 test-docsy:
 	@rm -rf target/test/docsy
-	@git clone -b v0.8.0 https://github.com/google/docsy.git target/test/docsy
+	@git clone -b v0.10.0 https://github.com/google/docsy.git target/test/docsy
 	@docker run --rm -i -v $$(pwd)/target/test/docsy:/src -u $$(id -u) --entrypoint npm floryn90/hugo:ext-alpine install
 	@docker run --rm -i -v $$(pwd)/target/test/docsy:/src -u $$(id -u) floryn90/hugo:ext-alpine
 
@@ -46,7 +46,7 @@ bump:
 	@RELEASE=$(version) bump
 
 src/bin/buildx:
-	@wget -q -O src/bin/buildx https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64
+	@wget -q -O src/bin/buildx https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64
 	@chmod a+x src/bin/buildx
 	@docker buildx create --use
 

diff --git a/src/config/alpine-ext.yaml b/src/config/alpine-ext.yaml
@@ -15,6 +15,7 @@ images:
       - postcss
     platforms:
       - linux/amd64
+      - linux/arm64
 
   # Alpine + Hugo extended + CI
   ext-alpine-ci:
@@ -23,6 +24,7 @@ images:
       - $(VERSION)-ext-alpine-ci
     platforms:
       - linux/amd64
+      - linux/arm64
 
   # Alpine + Hugo extended + Onbuild
   ext-alpine-onbuild:
@@ -31,6 +33,7 @@ images:
       - $(VERSION)-ext-alpine-onbuild
     platforms:
       - linux/amd64
+      - linux/arm64
 
   # Alpine + Hugo extended + Asciidoctor
   ext-asciidoctor:
@@ -46,6 +49,7 @@ images:
       - postcss
     platforms:
       - linux/amd64
+      - linux/arm64
 
   # Alpine + Hugo extended + Asciidoctor + CI
   ext-asciidoctor-ci:
@@ -54,6 +58,7 @@ images:
       - $(VERSION)-ext-asciidoctor-ci
     platforms:
       - linux/amd64
+      - linux/arm64
 
   # Alpine + Hugo extended + Asciidoctor + Onbuild
   ext-asciidoctor-onbuild:
@@ -62,6 +67,7 @@ images:
       - $(VERSION)-ext-asciidoctor-onbuild
     platforms:
       - linux/amd64
+      - linux/arm64
 
   # Alpine + Hugo extended + Pandoc
   ext-pandoc:
@@ -78,6 +84,7 @@ images:
       - rst2html
     platforms:
       - linux/amd64
+      - linux/arm64
 
   # Alpine + Hugo extended + Pandoc + CI
   ext-pandoc-ci:
@@ -86,6 +93,7 @@ images:
       - $(VERSION)-ext-pandoc-ci
     platforms:
       - linux/amd64
+      - linux/arm64
 
   # Alpine + Hugo extended + Pandoc + Onbuild
   ext-pandoc-onbuild:
@@ -94,6 +102,7 @@ images:
       - $(VERSION)-ext-pandoc-onbuild
     platforms:
       - linux/amd64
+      - linux/arm64
 
 tests:
   hugo:
@@ -129,4 +138,4 @@ tests:
 
   rst2html:
     entrypoint: rst2html
-    command: --version
+    command: --version
diff --git a/src/config/alpine.yaml b/src/config/alpine.yaml
@@ -112,4 +112,4 @@ tests:
   pandoc:
     entrypoint: pandoc
     command: --version
-    expected: pandoc-default
+    expected: pandoc-default
diff --git a/src/docker/_base/image.df b/src/docker/_base/image.df
@@ -4,4 +4,4 @@ FROM busybox:latest AS busybox
 
 FROM debian:stable-slim AS debian
 
-FROM ubuntu:rolling AS ubuntu
+FROM ubuntu:latest AS ubuntu
diff --git a/src/docker/_base/nodejs.df b/src/docker/_base/nodejs.df
@@ -1,29 +1,45 @@
-FROM base--image--alpine AS fetcher-glibc
+# FROM base--image--alpine AS fetcher-glibc
 
-ARG TARGETPLATFORM
+# ARG TARGETPLATFORM
 
-ADD _script/nodejs-glibc.sh nodejs.sh
-RUN sh nodejs.sh
+# ADD _script/nodejs-glibc.sh nodejs.sh
+# RUN sh nodejs.sh
 
 
 
-FROM scratch AS glibc
+# FROM scratch AS glibc
 
-COPY --from=fetcher-glibc /files /
+# COPY --from=fetcher-glibc /files /
 
 
 
 
 
-FROM base--image--alpine AS fetcher-musl
+# FROM base--image--alpine AS fetcher-musl
 
-ARG TARGETPLATFORM
+# ARG TARGETPLATFORM
 
-ADD _script/nodejs-musl.sh nodejs.sh
-RUN sh nodejs.sh
+# ADD _script/nodejs-musl.sh nodejs.sh
+# RUN sh nodejs.sh
 
 
 
+# # FROM scratch AS musl
+
+# # COPY --from=fetcher-musl /files /
+
+
+
+# Use the official Node.js Alpine image as the first stage
+FROM node:current-alpine AS node-base
+
+# Initialize the second stage with your custom image
 FROM scratch AS musl
 
-COPY --from=fetcher-musl /files /
+# Copy Node.js, npm, and yarn related files and directories from the first stage to the second stage
+COPY --from=node-base /usr/lib /usr/lib
+COPY --from=node-base /usr/local/share /usr/local/share
+COPY --from=node-base /usr/local/lib /usr/local/lib
+COPY --from=node-base /usr/local/include /usr/local/include
+COPY --from=node-base /usr/local/bin /usr/local/bin
+COPY --from=node-base /opt /opt
diff --git a/src/docker/alpine-ext/ext-alpine.df b/src/docker/alpine-ext/ext-alpine.df
@@ -31,7 +31,7 @@ COPY --from=image / /
 RUN true \
  #
  # Install npm packages
- && npm install -g autoprefixer postcss postcss-cli yarn @babel/cli @babel/core @fullhuman/postcss-purgecss \
+ && npm install -g autoprefixer postcss postcss-cli @babel/cli @babel/core @fullhuman/postcss-purgecss \
  #
  # Install rst2html
  && pip install --break-system-packages rst2html \

diff --git a/src/docker/debian-ext/Dockerfile b/src/docker/debian-ext/Dockerfile
@@ -33,7 +33,7 @@ RUN true \
  && apt install -y ca-certificates curl gnupg \
  && mkdir -p /etc/apt/keyrings \
  && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
- && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_21.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
  && apt update \
  && apt install nodejs -y \
 #

diff --git a/src/docker/ubuntu-ext/Dockerfile b/src/docker/ubuntu-ext/Dockerfile
@@ -33,7 +33,7 @@ RUN true \
  && apt install -y ca-certificates curl gnupg \
  && mkdir -p /etc/apt/keyrings \
  && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
- && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_21.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
  && apt update \
  && apt install nodejs -y \
 #

diff --git a/src/files/_script/golang.sh b/src/files/_script/golang.sh
@@ -6,7 +6,7 @@ set -e
 set -u
 
 # Variables
-GOLANG_VERSION="1.22.2"
+GOLANG_VERSION="1.22.4"
 
 # Architecture
 TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}

diff --git a/src/files/_script/nodejs-glibc.sh b/src/files/_script/nodejs-glibc.sh
@@ -6,7 +6,7 @@ set -e
 set -u
 
 # Variables
-NODE_VERSION="21.7.3"
+NODE_VERSION="22.3.0"
 
 # Architecture
 TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}

diff --git a/src/files/_script/nodejs-musl.sh b/src/files/_script/nodejs-musl.sh
@@ -6,7 +6,7 @@ set -e
 set -u
 
 # Variables
-NODE_VERSION="21.7.3"
+NODE_VERSION="22.3.0"
 
 # Architecture
 TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}

diff --git a/src/files/_script/pandoc.sh b/src/files/_script/pandoc.sh
@@ -6,7 +6,7 @@ set -e
 set -u
 
 # Variables
-PANDOC_VERSION="3.1.13"
+PANDOC_VERSION="3.2"
 
 # Architecture
 TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ FROM busybox:latest AS busybox

		FROM debian:stable-slim AS debian

		FROM ubuntu:rolling AS ubuntu
		FROM ubuntu:latest AS ubuntu