From 36abd4e7626e9073ce32b612b3b851db1bea4fc7 Mon Sep 17 00:00:00 2001 From: sturman <4456572+sturman@users.noreply.github.com> Date: Sat, 24 Feb 2024 21:50:33 +0200 Subject: [PATCH] Revert "Install `envsubst` alternative (Go version)" This reverts commit 62dab7b4 --- Dockerfile | 7 ++----- Dockerfile.aarch64 | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index e1d2645..323a50b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,6 @@ LABEL maintainer="thespad" # environment settings ARG UNIFI_BRANCH="stable" ENV DEBIAN_FRONTEND="noninteractive" -ARG ENVSUBST_VERSION=v1.4.2 RUN \ echo "**** install packages ****" && \ @@ -21,10 +20,8 @@ RUN \ jsvc \ logrotate \ openjdk-17-jre-headless \ - unzip && \ - curl -L https://github.com/a8m/envsubst/releases/download/${ENVSUBST_VERSION}/envsubst-`uname -s`-`uname -m` -o envsubst && \ - chmod +x envsubst && \ - mv envsubst /usr/local/bin && \ + unzip \ + gettext && \ echo "**** install unifi ****" && \ if [ -z ${UNIFI_VERSION+x} ]; then \ UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a26073f..e705ccc 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,7 +12,6 @@ LABEL maintainer="thespad" # environment settings ARG UNIFI_BRANCH="stable" ENV DEBIAN_FRONTEND="noninteractive" -ARG ENVSUBST_VERSION=v1.4.2 RUN \ echo "**** install packages ****" && \ @@ -21,10 +20,8 @@ RUN \ jsvc \ logrotate \ openjdk-17-jre-headless \ - unzip && \ - curl -L https://github.com/a8m/envsubst/releases/download/${ENVSUBST_VERSION}/envsubst-`uname -s`-`uname -m` -o envsubst && \ - chmod +x envsubst && \ - mv envsubst /usr/local/bin && \ + unzip \ + gettext && \ echo "**** install unifi ****" && \ if [ -z ${UNIFI_VERSION+x} ]; then \ UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \