container/nginx
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

fix: use arm binaries for arm images
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Robert Kaussow 2021-02-15 21:33:08 +01:00
parent d325f8a04a
commit 3a17ab6f90
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.amd64
View File

@ -17,6 +17,8 @@ ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.9.0}"
ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}" ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}"
# renovate: datasource=github-releases depName=thegeeklab/url-parser # renovate: datasource=github-releases depName=thegeeklab/url-parser
ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.1}" 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 && \ RUN addgroup -g 101 -S nginx && \
adduser -S -D -H -u 101 -h /var/www -s /sbin/nologin -G nginx -g nginx 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/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/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/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/gomplate && \
chmod 755 /usr/local/bin/supercronic && \ chmod 755 /usr/local/bin/supercronic && \
chmod 755 /usr/local/bin/url-parser && \ chmod 755 /usr/local/bin/url-parser && \

10
Dockerfile.arm
View File

@ -17,6 +17,8 @@ ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.9.0}"
ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}" ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}"
# renovate: datasource=github-releases depName=thegeeklab/url-parser # renovate: datasource=github-releases depName=thegeeklab/url-parser
ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.1}" 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 && \ RUN addgroup -g 101 -S nginx && \
adduser -S -D -H -u 101 -h /var/www -s /sbin/nologin -G nginx -g nginx 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 && \ apk --update --no-cache add nginx ca-certificates && \
rm -rf /var/www/localhost && \ rm -rf /var/www/localhost && \
rm -rf /etc/nginx/conf.d && \ 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/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-amd64" && \ 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-amd64" && \ 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://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/gomplate && \
chmod 755 /usr/local/bin/supercronic && \ chmod 755 /usr/local/bin/supercronic && \
chmod 755 /usr/local/bin/url-parser && \ chmod 755 /usr/local/bin/url-parser && \

10
Dockerfile.arm64
View File

@ -17,6 +17,8 @@ ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.9.0}"
ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}" ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}"
# renovate: datasource=github-releases depName=thegeeklab/url-parser # renovate: datasource=github-releases depName=thegeeklab/url-parser
ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.1}" 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 && \ RUN addgroup -g 101 -S nginx && \
adduser -S -D -H -u 101 -h /var/www -s /sbin/nologin -G nginx -g nginx 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 && \ apk --update --no-cache add nginx ca-certificates && \
rm -rf /var/www/localhost && \ rm -rf /var/www/localhost && \
rm -rf /etc/nginx/conf.d && \ 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/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-amd64" && \ 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-amd64" && \ 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://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/gomplate && \
chmod 755 /usr/local/bin/supercronic && \ chmod 755 /usr/local/bin/supercronic && \
chmod 755 /usr/local/bin/url-parser && \ chmod 755 /usr/local/bin/url-parser && \