From 3f93131f48be6ac229aaa54f994aa828cd906198 Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 11 Aug 2024 10:51:56 -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.3.14 Dockerfile.3.15 Dockerfile.3.16 Dockerfile.3.17 Dockerfile.3.18 Dockerfile.3.19 Dockerfile.3.20 Dockerfile.edge .env.scripts .env.scripts.3.14 .env.scripts.3.15 .env.scripts.3.16 .env.scripts.3.17 .env.scripts.3.18 .env.scripts.3.19 .env.scripts.3.20 .env.scripts.edge .gitea/workflows/docker.3.14.yaml .gitea/workflows/docker.3.15.yaml .gitea/workflows/docker.3.16.yaml .gitea/workflows/docker.3.17.yaml .gitea/workflows/docker.3.18.yaml .gitea/workflows/docker.3.19.yaml .gitea/workflows/docker.3.20.yaml .gitea/workflows/docker.edge.yaml .gitea/workflows/docker.yaml --- .env.scripts | 4 ++-- .env.scripts.3.14 | 4 ++-- .env.scripts.3.15 | 4 ++-- .env.scripts.3.16 | 4 ++-- .env.scripts.3.17 | 4 ++-- .env.scripts.3.18 | 4 ++-- .env.scripts.3.19 | 4 ++-- .env.scripts.3.20 | 4 ++-- .env.scripts.edge | 4 ++-- .gitea/workflows/docker.3.14.yaml | 2 +- .gitea/workflows/docker.3.15.yaml | 2 +- .gitea/workflows/docker.3.16.yaml | 2 +- .gitea/workflows/docker.3.17.yaml | 2 +- .gitea/workflows/docker.3.18.yaml | 2 +- .gitea/workflows/docker.3.19.yaml | 2 +- .gitea/workflows/docker.3.20.yaml | 2 +- .gitea/workflows/docker.edge.yaml | 2 +- .gitea/workflows/docker.yaml | 2 ++ Dockerfile | 13 ++++++------- Dockerfile.3.14 | 13 ++++++------- Dockerfile.3.15 | 13 ++++++------- Dockerfile.3.16 | 13 ++++++------- Dockerfile.3.17 | 13 ++++++------- Dockerfile.3.18 | 13 ++++++------- Dockerfile.3.19 | 13 ++++++------- Dockerfile.3.20 | 13 ++++++------- Dockerfile.edge | 13 ++++++------- 27 files changed, 82 insertions(+), 89 deletions(-) diff --git a/.env.scripts b/.env.scripts index 9372135..5809d18 100644 --- a/.env.scripts +++ b/.env.scripts @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111050-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:33 AM EDT 2024 +# @@Created : Sun Aug 11 10:50:49 AM EDT 2024 # @@File : .env.scripts # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.14 b/.env.scripts.3.14 index 378dc31..d2b5e1b 100644 --- a/.env.scripts.3.14 +++ b/.env.scripts.3.14 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111050-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:33 AM EDT 2024 +# @@Created : Sun Aug 11 10:50:49 AM EDT 2024 # @@File : .env.scripts.3.14 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.15 b/.env.scripts.3.15 index 7b1b776..0d5e1c2 100644 --- a/.env.scripts.3.15 +++ b/.env.scripts.3.15 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111050-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:34 AM EDT 2024 +# @@Created : Sun Aug 11 10:50:49 AM EDT 2024 # @@File : .env.scripts.3.15 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.16 b/.env.scripts.3.16 index 4972b92..1b7849e 100644 --- a/.env.scripts.3.16 +++ b/.env.scripts.3.16 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111050-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:34 AM EDT 2024 +# @@Created : Sun Aug 11 10:50:50 AM EDT 2024 # @@File : .env.scripts.3.16 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.17 b/.env.scripts.3.17 index c9b5ca4..3b5a79c 100644 --- a/.env.scripts.3.17 +++ b/.env.scripts.3.17 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111050-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:34 AM EDT 2024 +# @@Created : Sun Aug 11 10:50:50 AM EDT 2024 # @@File : .env.scripts.3.17 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.18 b/.env.scripts.3.18 index c39c68d..6e976fc 100644 --- a/.env.scripts.3.18 +++ b/.env.scripts.3.18 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111050-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:35 AM EDT 2024 +# @@Created : Sun Aug 11 10:50:50 AM EDT 2024 # @@File : .env.scripts.3.18 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.19 b/.env.scripts.3.19 index 353728d..2a5fd15 100644 --- a/.env.scripts.3.19 +++ b/.env.scripts.3.19 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111050-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:35 AM EDT 2024 +# @@Created : Sun Aug 11 10:50:50 AM EDT 2024 # @@File : .env.scripts.3.19 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.20 b/.env.scripts.3.20 index 957912a..b6bb967 100644 --- a/.env.scripts.3.20 +++ b/.env.scripts.3.20 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111050-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:35 AM EDT 2024 +# @@Created : Sun Aug 11 10:50:51 AM EDT 2024 # @@File : .env.scripts.3.20 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.edge b/.env.scripts.edge index ec96068..8283292 100644 --- a/.env.scripts.edge +++ b/.env.scripts.edge @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111050-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:35 AM EDT 2024 +# @@Created : Sun Aug 11 10:50:51 AM EDT 2024 # @@File : .env.scripts.edge # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitea/workflows/docker.3.14.yaml b/.gitea/workflows/docker.3.14.yaml index 5ffa79f..47ef543 100644 --- a/.gitea/workflows/docker.3.14.yaml +++ b/.gitea/workflows/docker.3.14.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=3.14 >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "3.14") >> $GITHUB_OUTPUT echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG" diff --git a/.gitea/workflows/docker.3.15.yaml b/.gitea/workflows/docker.3.15.yaml index 2f9d690..68e94a1 100644 --- a/.gitea/workflows/docker.3.15.yaml +++ b/.gitea/workflows/docker.3.15.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=3.15 >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "3.15") >> $GITHUB_OUTPUT echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG" diff --git a/.gitea/workflows/docker.3.16.yaml b/.gitea/workflows/docker.3.16.yaml index e6f796e..71048ca 100644 --- a/.gitea/workflows/docker.3.16.yaml +++ b/.gitea/workflows/docker.3.16.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=3.16 >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "3.16") >> $GITHUB_OUTPUT echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG" diff --git a/.gitea/workflows/docker.3.17.yaml b/.gitea/workflows/docker.3.17.yaml index 934ffea..81e35f2 100644 --- a/.gitea/workflows/docker.3.17.yaml +++ b/.gitea/workflows/docker.3.17.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=3.17 >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "3.17") >> $GITHUB_OUTPUT echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG" diff --git a/.gitea/workflows/docker.3.18.yaml b/.gitea/workflows/docker.3.18.yaml index 7cb4091..5544fda 100644 --- a/.gitea/workflows/docker.3.18.yaml +++ b/.gitea/workflows/docker.3.18.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=3.18 >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "3.18") >> $GITHUB_OUTPUT echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG" diff --git a/.gitea/workflows/docker.3.19.yaml b/.gitea/workflows/docker.3.19.yaml index a79c069..e34bccb 100644 --- a/.gitea/workflows/docker.3.19.yaml +++ b/.gitea/workflows/docker.3.19.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=3.19 >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "3.19") >> $GITHUB_OUTPUT echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG" diff --git a/.gitea/workflows/docker.3.20.yaml b/.gitea/workflows/docker.3.20.yaml index a957476..69060ca 100644 --- a/.gitea/workflows/docker.3.20.yaml +++ b/.gitea/workflows/docker.3.20.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=3.20 >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "3.20") >> $GITHUB_OUTPUT echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG" diff --git a/.gitea/workflows/docker.edge.yaml b/.gitea/workflows/docker.edge.yaml index 21883c0..fa1e763 100644 --- a/.gitea/workflows/docker.edge.yaml +++ b/.gitea/workflows/docker.edge.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=edge >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "edge") >> $GITHUB_OUTPUT echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG" diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index d74ab55..4e1aae0 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -19,6 +19,7 @@ jobs: - name: Get Meta id: meta run: | + echo DATE_TAG=$(date +'%y%m') echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "latest") >> $GITHUB_OUTPUT @@ -46,4 +47,5 @@ jobs: linux/arm64 push: true tags: | # replace it with your local IP and tags + ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DATE_TAG }} ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }} diff --git a/Dockerfile b/Dockerfile index 3f595e9..01b5ca5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # Docker image for alpine using the alpine template ARG IMAGE_NAME="alpine" ARG PHP_SERVER="alpine" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -53,8 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils \ - findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -72,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null)"; \ + SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ + BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ @@ -142,7 +141,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -159,7 +158,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom" && exit 10; };echo "Done running the custom script";fi; \ diff --git a/Dockerfile.3.14 b/Dockerfile.3.14 index 1e058ec..af6977e 100644 --- a/Dockerfile.3.14 +++ b/Dockerfile.3.14 @@ -2,7 +2,7 @@ # Docker image for alpine using the alpine template ARG IMAGE_NAME="alpine" ARG PHP_SERVER="alpine" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -53,8 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils \ - findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -72,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null)"; \ + SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ + BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ @@ -142,7 +141,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -159,7 +158,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom" && exit 10; };echo "Done running the custom script";fi; \ diff --git a/Dockerfile.3.15 b/Dockerfile.3.15 index 210be79..6f364d4 100644 --- a/Dockerfile.3.15 +++ b/Dockerfile.3.15 @@ -2,7 +2,7 @@ # Docker image for alpine using the alpine template ARG IMAGE_NAME="alpine" ARG PHP_SERVER="alpine" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -53,8 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils \ - findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -72,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null)"; \ + SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ + BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ @@ -142,7 +141,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -159,7 +158,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom" && exit 10; };echo "Done running the custom script";fi; \ diff --git a/Dockerfile.3.16 b/Dockerfile.3.16 index 7296c61..eaa7bf4 100644 --- a/Dockerfile.3.16 +++ b/Dockerfile.3.16 @@ -2,7 +2,7 @@ # Docker image for alpine using the alpine template ARG IMAGE_NAME="alpine" ARG PHP_SERVER="alpine" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -53,8 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils \ - findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -72,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null)"; \ + SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ + BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ @@ -142,7 +141,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -159,7 +158,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom" && exit 10; };echo "Done running the custom script";fi; \ diff --git a/Dockerfile.3.17 b/Dockerfile.3.17 index fd6a848..75d6e9b 100644 --- a/Dockerfile.3.17 +++ b/Dockerfile.3.17 @@ -2,7 +2,7 @@ # Docker image for alpine using the alpine template ARG IMAGE_NAME="alpine" ARG PHP_SERVER="alpine" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -53,8 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils \ - findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -72,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null)"; \ + SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ + BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ @@ -142,7 +141,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -159,7 +158,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom" && exit 10; };echo "Done running the custom script";fi; \ diff --git a/Dockerfile.3.18 b/Dockerfile.3.18 index 3bdf649..7f4f3c8 100644 --- a/Dockerfile.3.18 +++ b/Dockerfile.3.18 @@ -2,7 +2,7 @@ # Docker image for alpine using the alpine template ARG IMAGE_NAME="alpine" ARG PHP_SERVER="alpine" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -53,8 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils \ - findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -72,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null)"; \ + SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ + BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ @@ -142,7 +141,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -159,7 +158,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom" && exit 10; };echo "Done running the custom script";fi; \ diff --git a/Dockerfile.3.19 b/Dockerfile.3.19 index 559b11c..31826e5 100644 --- a/Dockerfile.3.19 +++ b/Dockerfile.3.19 @@ -2,7 +2,7 @@ # Docker image for alpine using the alpine template ARG IMAGE_NAME="alpine" ARG PHP_SERVER="alpine" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -53,8 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils \ - findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -72,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null)"; \ + SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ + BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ @@ -142,7 +141,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -159,7 +158,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom" && exit 10; };echo "Done running the custom script";fi; \ diff --git a/Dockerfile.3.20 b/Dockerfile.3.20 index 9e466bf..56f9719 100644 --- a/Dockerfile.3.20 +++ b/Dockerfile.3.20 @@ -2,7 +2,7 @@ # Docker image for alpine using the alpine template ARG IMAGE_NAME="alpine" ARG PHP_SERVER="alpine" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -53,8 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils \ - findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -72,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null)"; \ + SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ + BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ @@ -142,7 +141,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -159,7 +158,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom" && exit 10; };echo "Done running the custom script";fi; \ diff --git a/Dockerfile.edge b/Dockerfile.edge index 05f3af7..d883ad0 100644 --- a/Dockerfile.edge +++ b/Dockerfile.edge @@ -2,7 +2,7 @@ # Docker image for alpine using the alpine template ARG IMAGE_NAME="alpine" ARG PHP_SERVER="alpine" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -53,8 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils \ - findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -72,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null)"; \ + SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ + BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ @@ -142,7 +141,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -159,7 +158,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ - echo "" +echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom" && exit 10; };echo "Done running the custom script";fi; \