From dbfcce43ea3ffddfb7b23b286821cc6abc46da6c Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 11 Aug 2024 09:41:07 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile Dockerfile.10 Dockerfile.11 Dockerfile.12 Dockerfile.13 .env.scripts .env.scripts.10 .env.scripts.11 .env.scripts.12 .env.scripts.13 --- .env.scripts | 2 +- .env.scripts.10 | 2 +- .env.scripts.11 | 2 +- .env.scripts.12 | 2 +- .env.scripts.13 | 2 +- Dockerfile | 4 +++- Dockerfile.10 | 4 +++- Dockerfile.11 | 4 +++- Dockerfile.12 | 4 +++- Dockerfile.13 | 4 +++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.env.scripts b/.env.scripts index 953f668..fe67b42 100644 --- a/.env.scripts +++ b/.env.scripts @@ -48,5 +48,5 @@ DEFAULT_DATA_DIR="/usr/local/share/template-files/data" DEFAULT_CONF_DIR="/usr/local/share/template-files/config" DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.10 b/.env.scripts.10 index cc5e79c..6fde8cd 100644 --- a/.env.scripts.10 +++ b/.env.scripts.10 @@ -48,5 +48,5 @@ DEFAULT_DATA_DIR="/usr/local/share/template-files/data" DEFAULT_CONF_DIR="/usr/local/share/template-files/config" DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.11 b/.env.scripts.11 index f7cf5ea..44f1005 100644 --- a/.env.scripts.11 +++ b/.env.scripts.11 @@ -48,5 +48,5 @@ DEFAULT_DATA_DIR="/usr/local/share/template-files/data" DEFAULT_CONF_DIR="/usr/local/share/template-files/config" DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.12 b/.env.scripts.12 index b2750d4..6f727e9 100644 --- a/.env.scripts.12 +++ b/.env.scripts.12 @@ -48,5 +48,5 @@ DEFAULT_DATA_DIR="/usr/local/share/template-files/data" DEFAULT_CONF_DIR="/usr/local/share/template-files/config" DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.13 b/.env.scripts.13 index c977a52..1759527 100644 --- a/.env.scripts.13 +++ b/.env.scripts.13 @@ -48,5 +48,5 @@ DEFAULT_DATA_DIR="/usr/local/share/template-files/data" DEFAULT_CONF_DIR="/usr/local/share/template-files/config" DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ENV_PACKAGES="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Dockerfile b/Dockerfile index c4d77c1..d5a1c6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -76,6 +76,8 @@ RUN set -e; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ apt update && apt install -yy bash locales apt-utils; \ update-alternatives --install /bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/bash sh /bin/bash 1; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG diff --git a/Dockerfile.10 b/Dockerfile.10 index ace9a48..cd764e4 100644 --- a/Dockerfile.10 +++ b/Dockerfile.10 @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -76,6 +76,8 @@ RUN set -e; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ apt update && apt install -yy bash locales apt-utils; \ update-alternatives --install /bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/bash sh /bin/bash 1; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG diff --git a/Dockerfile.11 b/Dockerfile.11 index 08ec698..3f97565 100644 --- a/Dockerfile.11 +++ b/Dockerfile.11 @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -76,6 +76,8 @@ RUN set -e; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ apt update && apt install -yy bash locales apt-utils; \ update-alternatives --install /bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/bash sh /bin/bash 1; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG diff --git a/Dockerfile.12 b/Dockerfile.12 index fa56670..b295708 100644 --- a/Dockerfile.12 +++ b/Dockerfile.12 @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -76,6 +76,8 @@ RUN set -e; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ apt update && apt install -yy bash locales apt-utils; \ update-alternatives --install /bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/bash sh /bin/bash 1; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG diff --git a/Dockerfile.13 b/Dockerfile.13 index ad94652..9f370f1 100644 --- a/Dockerfile.13 +++ b/Dockerfile.13 @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -76,6 +76,8 @@ RUN set -e; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ apt update && apt install -yy bash locales apt-utils; \ update-alternatives --install /bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/sh sh /bin/bash 1; \ + update-alternatives --install /usr/bin/bash sh /bin/bash 1; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG