From 3a17ab6f90ff8bcffff6bfea5e7e19506b8867a8 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 15 Feb 2021 21:33:08 +0100 Subject: [PATCH] fix: use arm binaries for arm images --- Dockerfile.amd64 | 4 +++- Dockerfile.arm | 10 ++++++---- Dockerfile.arm64 | 10 ++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 7a6185a..04f0628 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -17,6 +17,8 @@ ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.9.0}" ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}" # renovate: datasource=github-releases depName=thegeeklab/url-parser ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.1}" +# renovate: datasource=github-releases depName=thegeeklab/wait-for +ENV WAIT_FOR_VERSION="${WAIT_FOR_VERSION:-v0.1.0}" RUN addgroup -g 101 -S nginx && \ adduser -S -D -H -u 101 -h /var/www -s /sbin/nologin -G nginx -g nginx nginx && \ @@ -27,7 +29,7 @@ RUN addgroup -g 101 -S nginx && \ curl -SsL -o /usr/local/bin/gomplate "https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_linux-amd64-slim" && \ curl -SsL -o /usr/local/bin/supercronic "https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/supercronic-linux-amd64" && \ curl -SsL -o /usr/local/bin/url-parser "https://github.com/thegeeklab/url-parser/releases/download/${URL_PARSER_VERSION}/url-parser-linux-amd64" && \ - curl -SsL -o /usr/local/bin/wait-for "https://raw.githubusercontent.com/thegeeklab/wait-for/master/wait-for" && \ + curl -SsL -o /usr/local/bin/wait-for "https://github.com/thegeeklab/wait-for/releases/download/${WAIT_FOR_VERSION}/wait-for" && \ chmod 755 /usr/local/bin/gomplate && \ chmod 755 /usr/local/bin/supercronic && \ chmod 755 /usr/local/bin/url-parser && \ diff --git a/Dockerfile.arm b/Dockerfile.arm index 0fd5787..2756028 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -17,6 +17,8 @@ ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.9.0}" ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}" # renovate: datasource=github-releases depName=thegeeklab/url-parser ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.1}" +# renovate: datasource=github-releases depName=thegeeklab/wait-for +ENV WAIT_FOR_VERSION="${WAIT_FOR_VERSION:-v0.1.0}" RUN addgroup -g 101 -S nginx && \ adduser -S -D -H -u 101 -h /var/www -s /sbin/nologin -G nginx -g nginx nginx && \ @@ -24,10 +26,10 @@ RUN addgroup -g 101 -S nginx && \ apk --update --no-cache add nginx ca-certificates && \ rm -rf /var/www/localhost && \ rm -rf /etc/nginx/conf.d && \ - curl -SsL -o /usr/local/bin/gomplate "https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_linux-amd64-slim" && \ - curl -SsL -o /usr/local/bin/supercronic "https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/supercronic-linux-amd64" && \ - curl -SsL -o /usr/local/bin/url-parser "https://github.com/thegeeklab/url-parser/releases/download/${URL_PARSER_VERSION}/url-parser-linux-amd64" && \ - curl -SsL -o /usr/local/bin/wait-for "https://raw.githubusercontent.com/thegeeklab/wait-for/master/wait-for" && \ + curl -SsL -o /usr/local/bin/gomplate "https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_linux-armv7-slim" && \ + curl -SsL -o /usr/local/bin/supercronic "https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/supercronic-linux-arm" && \ + curl -SsL -o /usr/local/bin/url-parser "https://github.com/thegeeklab/url-parser/releases/download/${URL_PARSER_VERSION}/url-parser-linux-arm-7" && \ + curl -SsL -o /usr/local/bin/wait-for "https://github.com/thegeeklab/wait-for/releases/download/${WAIT_FOR_VERSION}/wait-for" && \ chmod 755 /usr/local/bin/gomplate && \ chmod 755 /usr/local/bin/supercronic && \ chmod 755 /usr/local/bin/url-parser && \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 5bc672d..c45931f 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -17,6 +17,8 @@ ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.9.0}" ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}" # renovate: datasource=github-releases depName=thegeeklab/url-parser ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.1}" +# renovate: datasource=github-releases depName=thegeeklab/wait-for +ENV WAIT_FOR_VERSION="${WAIT_FOR_VERSION:-v0.1.0}" RUN addgroup -g 101 -S nginx && \ adduser -S -D -H -u 101 -h /var/www -s /sbin/nologin -G nginx -g nginx nginx && \ @@ -24,10 +26,10 @@ RUN addgroup -g 101 -S nginx && \ apk --update --no-cache add nginx ca-certificates && \ rm -rf /var/www/localhost && \ rm -rf /etc/nginx/conf.d && \ - curl -SsL -o /usr/local/bin/gomplate "https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_linux-amd64-slim" && \ - curl -SsL -o /usr/local/bin/supercronic "https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/supercronic-linux-amd64" && \ - curl -SsL -o /usr/local/bin/url-parser "https://github.com/thegeeklab/url-parser/releases/download/${URL_PARSER_VERSION}/url-parser-linux-amd64" && \ - curl -SsL -o /usr/local/bin/wait-for "https://raw.githubusercontent.com/thegeeklab/wait-for/master/wait-for" && \ + curl -SsL -o /usr/local/bin/gomplate "https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_linux-arm64-slim" && \ + curl -SsL -o /usr/local/bin/supercronic "https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/supercronic-linux-arm64" && \ + curl -SsL -o /usr/local/bin/url-parser "https://github.com/thegeeklab/url-parser/releases/download/${URL_PARSER_VERSION}/url-parser-linux-arm64" && \ + curl -SsL -o /usr/local/bin/wait-for "https://github.com/thegeeklab/wait-for/releases/download/${WAIT_FOR_VERSION}/wait-for" && \ chmod 755 /usr/local/bin/gomplate && \ chmod 755 /usr/local/bin/supercronic && \ chmod 755 /usr/local/bin/url-parser && \