From 3bb924971a55eaebb5f2e74a647eab6a670f936d Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 9 Oct 2021 22:10:58 +0200 Subject: [PATCH] feat: add container library --- Dockerfile.amd64 | 6 +++++- Dockerfile.arm | 6 +++++- Dockerfile.arm64 | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index ee75c01..36c98cf 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -10,6 +10,8 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/ngi ARG GOMPLATE_VERSION ARG SUPERCRONIC_VERSION ARG URL_PARSER_VERSION +ARG WAIT_FOR_VERSION +ARG CONTAINER_LIBRARY # renovate: datasource=github-releases depName=hairyhenderson/gomplate ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.10.0}" @@ -19,6 +21,8 @@ ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}" ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.5}" # renovate: datasource=github-releases depName=thegeeklab/wait-for ENV WAIT_FOR_VERSION="${WAIT_FOR_VERSION:-v0.2.0}" +# renovate: datasource=git-tags depName=https://gitea.rknet.org/docker/container-library +ENV CONTAINER_LIBRARY="${CONTAINER_LIBRARY:-v0.1.3}" RUN addgroup -g 101 -S nginx && \ adduser -S -D -H -u 101 -h /var/www -s /sbin/nologin -G nginx -g nginx nginx && \ @@ -26,7 +30,7 @@ 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 "https://gitea.rknet.org/docker/container-library/releases/download/${CONTAINER_LIBRARY}/container-library.tar.gz" | tar xz -C / && \ 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://github.com/thegeeklab/wait-for/releases/download/${WAIT_FOR_VERSION}/wait-for" && \ diff --git a/Dockerfile.arm b/Dockerfile.arm index aeea727..16477bf 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -10,6 +10,8 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/ngi ARG GOMPLATE_VERSION ARG SUPERCRONIC_VERSION ARG URL_PARSER_VERSION +ARG WAIT_FOR_VERSION +ARG CONTAINER_LIBRARY # renovate: datasource=github-releases depName=hairyhenderson/gomplate ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.10.0}" @@ -19,6 +21,8 @@ ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}" ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.5}" # renovate: datasource=github-releases depName=thegeeklab/wait-for ENV WAIT_FOR_VERSION="${WAIT_FOR_VERSION:-v0.2.0}" +# renovate: datasource=git-tags depName=https://gitea.rknet.org/docker/container-library +ENV CONTAINER_LIBRARY="${CONTAINER_LIBRARY:-v0.1.3}" RUN addgroup -g 101 -S nginx && \ adduser -S -D -H -u 101 -h /var/www -s /sbin/nologin -G nginx -g nginx nginx && \ @@ -26,7 +30,7 @@ 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-armv7-slim" && \ + curl -SsL "https://gitea.rknet.org/docker/container-library/releases/download/${CONTAINER_LIBRARY}/container-library.tar.gz" | tar xz -C / && \ 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" && \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 2f6ecf4..3825e1c 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -10,6 +10,8 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/ngi ARG GOMPLATE_VERSION ARG SUPERCRONIC_VERSION ARG URL_PARSER_VERSION +ARG WAIT_FOR_VERSION +ARG CONTAINER_LIBRARY # renovate: datasource=github-releases depName=hairyhenderson/gomplate ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.10.0}" @@ -19,6 +21,8 @@ ENV SUPERCRONIC_VERSION="${SUPERCRONIC_VERSION:-v0.1.12}" ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.5}" # renovate: datasource=github-releases depName=thegeeklab/wait-for ENV WAIT_FOR_VERSION="${WAIT_FOR_VERSION:-v0.2.0}" +# renovate: datasource=git-tags depName=https://gitea.rknet.org/docker/container-library +ENV CONTAINER_LIBRARY="${CONTAINER_LIBRARY:-v0.1.3}" RUN addgroup -g 101 -S nginx && \ adduser -S -D -H -u 101 -h /var/www -s /sbin/nologin -G nginx -g nginx nginx && \ @@ -26,7 +30,7 @@ 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-arm64-slim" && \ + curl -SsL "https://gitea.rknet.org/docker/container-library/releases/download/${CONTAINER_LIBRARY}/container-library.tar.gz" | tar xz -C / && \ 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" && \