From 035bc4b3a39ae5f4c4f566bb12d8ec2e0954e31a Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 16 Jul 2022 22:16:03 +0200 Subject: [PATCH] feat: add js-beautify --- Dockerfile.amd64 | 11 ++++++++--- Dockerfile.arm | 11 ++++++++--- Dockerfile.arm64 | 11 ++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 435a54c..ecfc10f 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -17,16 +17,21 @@ ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.11.1}" # renovate: datasource=github-releases depName=thegeeklab/url-parser ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.13}" # renovate: datasource=npm depName=prettier -ENV PRETTIER_VERSION="${BUILD_VERSION:-2.7.1}" +ENV PRETTIER_VERSION="${PRETTIER_VERSION:-2.7.1}" # renovate: datasource=npm depName=spellchecker-cli -ENV SPELLCHECKER_VERSION="${BUILD_VERSION:-4.11.0}" +ENV SPELLCHECKER_VERSION="${SPELLCHECKER_VERSION:-4.11.0}" +# renovate: datasource=npm depName=js-beautify +ENV JSBEAUTIFY_VERSION="${JSBEAUTIFY_VERSION:-1.14.4}" RUN apk --update add curl make tar git && \ curl -SsfL -o /usr/local/bin/gomplate "https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_linux-amd64" && \ curl -SsfL -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 -q --location=global "prettier@$PRETTIER_VERSION" "spellchecker-cli@$SPELLCHECKER_VERSION"; \ + npm install -q --location=global \ + "prettier@$PRETTIER_VERSION" \ + "spellchecker-cli@$SPELLCHECKER_VERSION" \ + "js-beautify@$JSBEAUTIFY_VERSION" && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* diff --git a/Dockerfile.arm b/Dockerfile.arm index 675cdf7..1ea3475 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -17,16 +17,21 @@ ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.11.1}" # renovate: datasource=github-releases depName=thegeeklab/url-parser ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.13}" # renovate: datasource=npm depName=prettier -ENV PRETTIER_VERSION="${BUILD_VERSION:-2.7.1}" +ENV PRETTIER_VERSION="${PRETTIER_VERSION:-2.7.1}" # renovate: datasource=npm depName=spellchecker-cli -ENV SPELLCHECKER_VERSION="${BUILD_VERSION:-4.11.0}" +ENV SPELLCHECKER_VERSION="${SPELLCHECKER_VERSION:-4.11.0}" +# renovate: datasource=npm depName=js-beautify +ENV JSBEAUTIFY_VERSION="${JSBEAUTIFY_VERSION:-4.11.0}" RUN apk --update add curl make tar git && \ curl -SsfL -o /usr/local/bin/gomplate "https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_linux-armv7" && \ curl -SsfL -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 --location=global "prettier@$PRETTIER_VERSION" "spellchecker-cli@$SPELLCHECKER_VERSION"; \ + npm install -q --location=global \ + "prettier@$PRETTIER_VERSION" \ + "spellchecker-cli@$SPELLCHECKER_VERSION" \ + "js-beautify@$JSBEAUTIFY_VERSION" && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 117a5a0..5db2f78 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -17,16 +17,21 @@ ENV GOMPLATE_VERSION="${GOMPLATE_VERSION:-v3.11.1}" # renovate: datasource=github-releases depName=thegeeklab/url-parser ENV URL_PARSER_VERSION="${URL_PARSER_VERSION:-v0.2.13}" # renovate: datasource=npm depName=prettier -ENV PRETTIER_VERSION="${BUILD_VERSION:-2.7.1}" +ENV PRETTIER_VERSION="${PRETTIER_VERSION:-2.7.1}" # renovate: datasource=npm depName=spellchecker-cli -ENV SPELLCHECKER_VERSION="${BUILD_VERSION:-4.11.0}" +ENV SPELLCHECKER_VERSION="${SPELLCHECKER_VERSION:-4.11.0}" +# renovate: datasource=npm depName=js-beautify +ENV JSBEAUTIFY_VERSION="${JSBEAUTIFY_VERSION:-4.11.0}" RUN apk --update add curl make tar git && \ curl -SsfL -o /usr/local/bin/gomplate "https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_linux-arm64" && \ curl -SsfL -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 --location=global "prettier@$PRETTIER_VERSION" "spellchecker-cli@$SPELLCHECKER_VERSION"; \ + npm install -q --location=global \ + "prettier@$PRETTIER_VERSION" \ + "spellchecker-cli@$SPELLCHECKER_VERSION" \ + "js-beautify@$JSBEAUTIFY_VERSION" && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/*