From d733763a496fa0520dac88ce5267c73ded1723ef Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 9 May 2021 17:14:51 +0200 Subject: [PATCH 1/2] switch to nodejs alpine image and add prettier --- Dockerfile.amd64 | 6 +++++- Dockerfile.arm | 2 +- Dockerfile.arm64 | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index d31004b..6d211e3 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -1,4 +1,4 @@ -FROM amd64/alpine:3.13@sha256:def822f9851ca422481ec6fee59a9966f12b351c62ccb9aca841526ffaa9f748 +FROM amd64/node:lts-alpine3.13 LABEL maintainer="Robert Kaussow " LABEL org.opencontainers.image.authors="Robert Kaussow " @@ -10,17 +10,21 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/alp ARG GOMPLATE_VERSION ARG SUPERCRONIC_VERSION ARG URL_PARSER_VERSION +ARG PRETTIER_VERSION # renovate: datasource=github-releases depName=hairyhenderson/gomplate ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.9.0}" # renovate: datasource=github-releases depName=thegeeklab/url-parser ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.3}" +# renovate: datasource=npm depName=prettier +ENV PRETTIER_VERSION="${BUILD_VERSION:-2.2.0}" RUN apk --update add curl make tar git && \ 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/url-parser "https://github.com/thegeeklab/url-parser/releases/download/${URL_PARSER_VERSION}/url-parser-linux-amd64" && \ chmod 755 /usr/local/bin/gomplate && \ chmod 755 /usr/local/bin/url-parser && \ + npm install -g prettier@"$PRETTIER_VERSION"; \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* diff --git a/Dockerfile.arm b/Dockerfile.arm index 27eef89..49a37bb 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,4 +1,4 @@ -FROM arm32v7/alpine:3.13@sha256:9663906b1c3bf891618ebcac857961531357525b25493ef717bca0f86f581ad6 +FROM arm32v7/node:lts-alpine3.13 LABEL maintainer="Robert Kaussow " LABEL org.opencontainers.image.authors="Robert Kaussow " diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index b4eab10..bf823b6 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.13@sha256:8f18fae117ec6e5777cc62ba78cbb3be10a8a38639ccfb949521abd95c8301a4 +FROM arm64v8/node:lts-alpine3.13 LABEL maintainer="Robert Kaussow " LABEL org.opencontainers.image.authors="Robert Kaussow " -- 2.24.4 From 7339041837d09cb62633b94fd6c4782004006731 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 9 May 2021 17:26:05 +0200 Subject: [PATCH 2/2] add prettier to arm dockefiles --- Dockerfile.amd64 | 2 +- Dockerfile.arm | 2 ++ Dockerfile.arm64 | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 6d211e3..9f791a0 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -24,7 +24,7 @@ RUN apk --update add curl make tar git && \ curl -SsL -o /usr/local/bin/url-parser "https://github.com/thegeeklab/url-parser/releases/download/${URL_PARSER_VERSION}/url-parser-linux-amd64" && \ chmod 755 /usr/local/bin/gomplate && \ chmod 755 /usr/local/bin/url-parser && \ - npm install -g prettier@"$PRETTIER_VERSION"; \ + npm install -q -g prettier@"$PRETTIER_VERSION"; \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* diff --git a/Dockerfile.arm b/Dockerfile.arm index 49a37bb..fb03b6d 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -10,6 +10,7 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/alp ARG GOMPLATE_VERSION ARG SUPERCRONIC_VERSION ARG URL_PARSER_VERSION +ARG PRETTIER_VERSION # renovate: datasource=github-releases depName=hairyhenderson/gomplate ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.9.0}" @@ -21,6 +22,7 @@ RUN apk --update add curl make tar git && \ curl -SsL -o /usr/local/bin/url-parser "https://github.com/thegeeklab/url-parser/releases/download/${URL_PARSER_VERSION}/url-parser-linux-arm-7" && \ chmod 755 /usr/local/bin/gomplate && \ chmod 755 /usr/local/bin/url-parser && \ + npm install -q -g prettier@"$PRETTIER_VERSION"; \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index bf823b6..79828b7 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -10,17 +10,21 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/alp ARG GOMPLATE_VERSION ARG SUPERCRONIC_VERSION ARG URL_PARSER_VERSION +ARG PRETTIER_VERSION # renovate: datasource=github-releases depName=hairyhenderson/gomplate ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.9.0}" # renovate: datasource=github-releases depName=thegeeklab/url-parser ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.3}" +# renovate: datasource=npm depName=prettier +ENV PRETTIER_VERSION="${BUILD_VERSION:-2.2.0}" RUN apk --update add curl make tar git && \ 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/url-parser "https://github.com/thegeeklab/url-parser/releases/download/${URL_PARSER_VERSION}/url-parser-linux-arm64" && \ chmod 755 /usr/local/bin/gomplate && \ chmod 755 /usr/local/bin/url-parser && \ + npm install -q -g prettier@"$PRETTIER_VERSION"; \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* -- 2.24.4