Use machine hardware name instead of TARGETARCH in tarball name

The tarball contains a subdirectory named by the machine hardware name, so the tarball name should match this. Signed-off-by: Jan Dubois <[email protected]>
rancher-sandbox · Jun 27, 2024 · f430334 · f430334
1 parent 22b4029
commit f430334
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/.github/workflows/package.Dockerfile b/.github/workflows/package.Dockerfile
@@ -22,18 +22,17 @@ RUN abuild -r
 WORKDIR /alpine/openresty
 RUN abuild -r
 
-ARG TARGETARCH
 ARG RELEASE_VERSION
 WORKDIR /home/abuild-user/packages/alpine/
 RUN cp ~/.abuild/rd-openresty-*.pub .
-RUN tar cvf /tmp/openresty-${TARGETARCH}.tar \
+RUN tar cvf /tmp/openresty-$(uname -m).tar \
     *.pub \
     $(uname -m)/rd-openresty-[0-9]*.apk \
     $(uname -m)/rd-openresty-openssl111-[0-9]*.apk \
     $(uname -m)/rd-openresty-pcre-[0-9]*.apk \
     $(uname -m)/rd-openresty-zlib-[0-9]*.apk
 RUN if [ -n "${RELEASE_VERSION}" ]; \
-    then mv /tmp/openresty-${TARGETARCH}.tar /tmp/openresty-${RELEASE_VERSION}-${TARGETARCH}.tar; \
+    then mv /tmp/openresty-$(uname -m).tar /tmp/openresty-${RELEASE_VERSION}-$(uname -m).tar; \
     fi
 
 FROM scratch