From 4dc3b76db247b51e9cdabf0d8e8ad382ef2d6c22 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 9 Oct 2021 22:19:19 +0200 Subject: [PATCH] feat: add container library --- Dockerfile.amd64 | 12 +++++++++--- Dockerfile.arm | 13 ++++++++++--- Dockerfile.arm64 | 13 ++++++++++--- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index bde199d..ca01874 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -1,8 +1,5 @@ FROM alpine:3.14@sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a -ARG GOMPLATE_VERSION -ARG SUPERCRONIC_VERSION -ARG URL_PARSER_VERSION ARG DOCKER_IMAGE_CREATED LABEL maintainer="Robert Kaussow " @@ -13,6 +10,12 @@ LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/alpine" LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/alpine" LABEL org.opencontainers.image.created="${DOCKER_IMAGE_CREATED}" +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}" # renovate: datasource=github-releases depName=aptible/supercronic @@ -21,10 +24,13 @@ 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 app && \ adduser -S -D -H -u 101 -h /app -s /sbin/nologin -G app -g app app && \ apk --update add --virtual .build-deps curl && \ + 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" && \ diff --git a/Dockerfile.arm b/Dockerfile.arm index f0de050..934a6db 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,8 +1,5 @@ FROM arm32v7/alpine:3.14@sha256:e12ff876f0075740ed3d7bdf788107ae84c1b3dd6dc98b3baea41088aba5236f -ARG GOMPLATE_VERSION -ARG SUPERCRONIC_VERSION -ARG URL_PARSER_VERSION ARG DOCKER_IMAGE_CREATED LABEL maintainer="Robert Kaussow " @@ -11,6 +8,13 @@ LABEL org.opencontainers.image.title="alpine" LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/alpine" LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/alpine" LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/alpine" +LABEL org.opencontainers.image.created="${DOCKER_IMAGE_CREATED}" + +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}" @@ -20,10 +24,13 @@ 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 app && \ adduser -S -D -H -u 101 -h /app -s /sbin/nologin -G app -g app app && \ apk --update add --virtual .build-deps curl && \ + 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" && \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index a8f9031..812db58 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,8 +1,5 @@ FROM arm64v8/alpine:3.14@sha256:b06a5cf61b2956088722c4f1b9a6f71dfe95f0b1fe285d44195452b8a1627de7 -ARG GOMPLATE_VERSION -ARG SUPERCRONIC_VERSION -ARG URL_PARSER_VERSION ARG DOCKER_IMAGE_CREATED LABEL maintainer="Robert Kaussow " @@ -11,6 +8,13 @@ LABEL org.opencontainers.image.title="alpine" LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/alpine" LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/alpine" LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/alpine" +LABEL org.opencontainers.image.created="${DOCKER_IMAGE_CREATED}" + +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}" @@ -20,10 +24,13 @@ 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 app && \ adduser -S -D -H -u 101 -h /app -s /sbin/nologin -G app -g app app && \ apk --update add --virtual .build-deps curl && \ + 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" && \