wip: alpine 3.16

docker/compose/Dockerfile

@@ -4,13 +4,13 @@ ARG DOCKER_BUILD_DIR
 
 ARG COMPOSE_REMOTE=https://github.com/docker/compose
 ARG COMPOSE_VERSION=2.5.0
-ARG OPERATING_SYSTEM=Linux
-ARG PROCESSOR_ARCHITECTURE=x86_64
+ARG SYSTEM=Linux
+ARG MACHINE=x86_64
 
 RUN apk update \
  && apk add --no-cache ca-certificates \
- && OS="$(echo ${OPERATING_SYSTEM} |awk '{print tolower($0)}')"; \
-    ARCH="$(echo ${PROCESSOR_ARCHITECTURE})"; \
+ && OS="$(echo ${SYSTEM} |awk '{print tolower($0)}')"; \
+    ARCH="$(echo ${MACHINE})"; \
     wget -qO /usr/bin/docker-compose ${COMPOSE_REMOTE}/releases/download/v${COMPOSE_VERSION}/docker-compose-${OS}-${ARCH} \
  && chmod +x /usr/bin/docker-compose
 

docker/fabio/Dockerfile

@@ -4,13 +4,13 @@ ARG DOCKER_BUILD_DIR
 
 ARG FABIO_REMOTE=https://github.com/fabiolb/fabio
 ARG FABIO_VERSION=1.6.0
-ARG OPERATING_SYSTEM=Linux
-ARG PROCESSOR_ARCHITECTURE=x86_64
+ARG SYSTEM=Linux
+ARG MACHINE=x86_64
 
 RUN apk update \
  && apk add --no-cache ca-certificates \
- && OS="$(echo ${OPERATING_SYSTEM} |awk '{print tolower($0)}')"; \
-    ARCH="$(echo ${PROCESSOR_ARCHITECTURE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"; \
+ && OS="$(echo ${SYSTEM} |awk '{print tolower($0)}')"; \
+    ARCH="$(echo ${MACHINE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"; \
     wget -qO /usr/bin/fabio ${FABIO_REMOTE}/releases/download/v${FABIO_VERSION}/fabio-${FABIO_VERSION}-${OS}_${ARCH} \
  && chmod +x /usr/bin/fabio
 

docker/myos/Dockerfile

@@ -3,8 +3,8 @@ LABEL maintainer aynic.os <support+docker@asycn.io>
 ARG DOCKER_BUILD_DIR
 ARG GIT_AUTHOR_NAME
 ARG GIT_AUTHOR_EMAIL
-ARG OPERATING_SYSTEM=Linux
-ARG PROCESSOR_ARCHITECTURE=x86_64
+ARG SYSTEM=Linux
+ARG MACHINE=x86_64
 
 ENV GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME}
 ENV GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
@@ -42,11 +42,11 @@ RUN git clone https://github.com/ingydotnet/git-subrepo \
 
 ARG IPFS_VERSION=0.14.0
 
-RUN { OS="$(echo ${OPERATING_SYSTEM} |awk '{print tolower($0)}')"; \
-    ARCH="$(echo ${PROCESSOR_ARCHITECTURE})"; \
+RUN { OS="$(echo ${SYSTEM} |awk '{print tolower($0)}')"; \
+    ARCH="$(echo ${MACHINE})"; \
     wget -qO - https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.${OS}.${ARCH}.tar.xz \
      |tar --strip-components 1 -C /usr/local/bin -xJf - shellcheck-stable/shellcheck; } \
- && { ARCH="$(echo ${PROCESSOR_ARCHITECTURE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"; \
+ && { ARCH="$(echo ${MACHINE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"; \
     wget -qO - https://github.com/ipfs/kubo/releases/download/v${IPFS_VERSION}/kubo_v${IPFS_VERSION}_${OS}-${ARCH}.tar.gz \
      |tar --strip-components 1 -C /usr/local/bin -xzf - kubo/ipfs; } \
  && mkdir -p /usr/local/lib/shellspec \

docker/packer/Dockerfile

@@ -2,9 +2,12 @@ FROM alpine:latest as dist
 LABEL maintainer aynic.os <support+docker@asycn.io>
 ARG DOCKER_BUILD_DIR
 
-ARG ARCH="$(uname -m |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"
-ARG OS="$(uname -o |awk '{print tolower($0)}')"
-ARG PACKER_VERSION=1.6.6
+ARG MACHINE="$(uname -m)"
+ARG SYSTEM="$(uname -s)"
+ARG ARCH="$(echo ${MACHINE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"
+ARG OS="$(echo ${SYSTEM} |awk '{print tolower($0)}')"
+
+ARG PACKER_VERSION=1.8.3
 
 RUN apk --no-cache add \
         ansible \
@@ -17,13 +20,13 @@ RUN apk --no-cache add \
         socat \
         wget
 
-ADD https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip ./
+ADD https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_${OS}_${ARCH}.zip ./
 ADD https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_SHA256SUMS ./
 
-RUN sed -i '/.*linux_amd64.zip/!d' packer_${PACKER_VERSION}_SHA256SUMS
-RUN sha256sum -cs packer_${PACKER_VERSION}_SHA256SUMS\
- && unzip packer_${PACKER_VERSION}_linux_amd64.zip -d /bin
-RUN rm -f packer_${PACKER_VERSION}_linux_amd64.zip
+RUN sed -i '/.*'"${OS}"'_'"${ARCH}"'.zip/!d' packer_${PACKER_VERSION}_SHA256SUMS \
+ && sha256sum -cs packer_${PACKER_VERSION}_SHA256SUMS \
+ && unzip "packer_${PACKER_VERSION}_${OS}_${ARCH}.zip" -d /bin \
+ && rm -f "packer_${PACKER_VERSION}_${OS}_${ARCH}.zip"
 
 ENTRYPOINT ["/bin/packer"]
 

docker/zen/Dockerfile

@@ -3,8 +3,8 @@ LABEL maintainer aynic.os <support+docker@asycn.io>
 ARG DOCKER_BUILD_DIR
 ARG GIT_AUTHOR_NAME
 ARG GIT_AUTHOR_EMAIL
-ARG OPERATING_SYSTEM=Linux
-ARG PROCESSOR_ARCHITECTURE=x86_64
+ARG SYSTEM=Linux
+ARG MACHINE=x86_64
 
 ENV GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME}
 ENV GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
@@ -41,12 +41,12 @@ RUN chmod +r /include.sh \
 
 ARG IPFS_VERSION=0.14.0
 
-RUN { OS="$(echo ${OPERATING_SYSTEM} |awk '{print tolower($0)}')"; \
-    ARCH="$(echo ${PROCESSOR_ARCHITECTURE})"; \
+RUN { OS="$(echo ${SYSTEM} |awk '{print tolower($0)}')"; \
+    ARCH="$(echo ${MACHINE})"; \
     wget -qO - https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.${OS}.${ARCH}.tar.xz \
      |tar --strip-components 1 -C /usr/local/bin -xJf - shellcheck-stable/shellcheck; } \
- && { OS="$(echo ${OPERATING_SYSTEM} |awk '{print tolower($0)}')"; \
-    ARCH="$(echo ${PROCESSOR_ARCHITECTURE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"; \
+ && { OS="$(echo ${SYSTEM} |awk '{print tolower($0)}')"; \
+    ARCH="$(echo ${MACHINE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"; \
     wget -qO - https://github.com/ipfs/kubo/releases/download/v${IPFS_VERSION}/kubo_v${IPFS_VERSION}_${OS}-${ARCH}.tar.gz \
      |tar --strip-components 1 -C /usr/local/bin -xzf - kubo/ipfs; } \
  && mkdir -p /usr/local/lib/shellspec \