diff --git a/.env.scripts.18.04 b/.env.scripts.18.04 index 9a98f53..60445db 100644 --- a/.env.scripts.18.04 +++ b/.env.scripts.18.04 @@ -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.19.04 b/.env.scripts.19.04 index b6cf3a6..2249f63 100644 --- a/.env.scripts.19.04 +++ b/.env.scripts.19.04 @@ -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.20.04 b/.env.scripts.20.04 index 49fb027..94e9b70 100644 --- a/.env.scripts.20.04 +++ b/.env.scripts.20.04 @@ -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.21.04 b/.env.scripts.21.04 index 7c5ceae..3277d31 100644 --- a/.env.scripts.21.04 +++ b/.env.scripts.21.04 @@ -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.22.04 b/.env.scripts.22.04 index 0ae23c8..b4a7172 100644 --- a/.env.scripts.22.04 +++ b/.env.scripts.22.04 @@ -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.23.04 b/.env.scripts.23.04 index ae9eb8e..3278472 100644 --- a/.env.scripts.23.04 +++ b/.env.scripts.23.04 @@ -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.23.10 b/.env.scripts.23.10 index 07ba578..159de71 100644 --- a/.env.scripts.23.10 +++ b/.env.scripts.23.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.24.04 b/.env.scripts.24.04 index 5f53410..442b608 100644 --- a/.env.scripts.24.04 +++ b/.env.scripts.24.04 @@ -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.24.10 b/.env.scripts.24.10 index 44f672e..d977338 100644 --- a/.env.scripts.24.10 +++ b/.env.scripts.24.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/Dockerfile b/Dockerfile index 252cd33..db9adf9 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.18.04 b/Dockerfile.18.04 index 5cd9cf7..9fe5ac0 100644 --- a/Dockerfile.18.04 +++ b/Dockerfile.18.04 @@ -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.19.04 b/Dockerfile.19.04 index c4f3881..b835279 100644 --- a/Dockerfile.19.04 +++ b/Dockerfile.19.04 @@ -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.20.04 b/Dockerfile.20.04 index d0b1079..e6c7765 100644 --- a/Dockerfile.20.04 +++ b/Dockerfile.20.04 @@ -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.21.04 b/Dockerfile.21.04 index 67e6f7b..e82d451 100644 --- a/Dockerfile.21.04 +++ b/Dockerfile.21.04 @@ -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.22.04 b/Dockerfile.22.04 index d60441d..13d25e3 100644 --- a/Dockerfile.22.04 +++ b/Dockerfile.22.04 @@ -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.23.04 b/Dockerfile.23.04 index ab4a398..0f2fe2c 100644 --- a/Dockerfile.23.04 +++ b/Dockerfile.23.04 @@ -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.23.10 b/Dockerfile.23.10 index 8d38765..efdd3cb 100644 --- a/Dockerfile.23.10 +++ b/Dockerfile.23.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.24.04 b/Dockerfile.24.04 index 595cc95..2f5e6eb 100644 --- a/Dockerfile.24.04 +++ b/Dockerfile.24.04 @@ -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.24.10 b/Dockerfile.24.10 index e3701f9..54fc3b3 100644 --- a/Dockerfile.24.10 +++ b/Dockerfile.24.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