From 24e124947f4fa7ebb5b987433deca626e4f645aa Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 11 Aug 2024 10:33:28 -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.8 Dockerfile.9 .env.scripts .env.scripts.8 .env.scripts.9 .gitea/workflows/docker.8.yaml .gitea/workflows/docker.9.yaml .gitea/workflows/docker.yaml --- .env.scripts | 4 ++-- .env.scripts.8 | 4 ++-- .env.scripts.9 | 4 ++-- .gitea/workflows/docker.8.yaml | 2 +- .gitea/workflows/docker.9.yaml | 4 ++-- .gitea/workflows/docker.yaml | 2 ++ Dockerfile | 6 +++--- Dockerfile.8 | 6 +++--- Dockerfile.9 | 6 +++--- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.env.scripts b/.env.scripts index fd9f8fd..7e4d347 100644 --- a/.env.scripts +++ b/.env.scripts @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111028-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:00 AM EDT 2024 +# @@Created : Sun Aug 11 10:28:27 AM EDT 2024 # @@File : .env.scripts # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.8 b/.env.scripts.8 index c3f8578..6bb1366 100644 --- a/.env.scripts.8 +++ b/.env.scripts.8 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111028-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:00 AM EDT 2024 +# @@Created : Sun Aug 11 10:28:28 AM EDT 2024 # @@File : .env.scripts.8 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.9 b/.env.scripts.9 index 894f16a..305082d 100644 --- a/.env.scripts.9 +++ b/.env.scripts.9 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111005-git +##@Version : 202408111028-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:05:00 AM EDT 2024 +# @@Created : Sun Aug 11 10:28:28 AM EDT 2024 # @@File : .env.scripts.9 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitea/workflows/docker.8.yaml b/.gitea/workflows/docker.8.yaml index 23af839..f22acb7 100644 --- a/.gitea/workflows/docker.8.yaml +++ b/.gitea/workflows/docker.8.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=8 >> $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 "8") >> $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.9.yaml b/.gitea/workflows/docker.9.yaml index b87c2aa..6865471 100644 --- a/.gitea/workflows/docker.9.yaml +++ b/.gitea/workflows/docker.9.yaml @@ -19,9 +19,9 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=9 >> $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 "9") >> $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" @@ -40,7 +40,7 @@ jobs: uses: docker/build-push-action@v4 with: context: . - file: ./Dockerfile.9 + file: ./Dockerfile.8 platforms: | linux/amd64 linux/arm64 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 dd4ff59..192b80e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # Docker image for almalinux using the rhel template ARG IMAGE_NAME="almalinux" ARG PHP_SERVER="almalinux" -ARG BUILD_DATE="202408111004" +ARG BUILD_DATE="202408111028" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -71,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ yum makecache && yum install -yy 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; \ diff --git a/Dockerfile.8 b/Dockerfile.8 index 0d81263..b7fcb35 100644 --- a/Dockerfile.8 +++ b/Dockerfile.8 @@ -2,7 +2,7 @@ # Docker image for almalinux using the rhel template ARG IMAGE_NAME="almalinux" ARG PHP_SERVER="almalinux" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111028" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -71,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ yum makecache && yum install -yy 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; \ diff --git a/Dockerfile.9 b/Dockerfile.9 index 7020887..f06cc81 100644 --- a/Dockerfile.9 +++ b/Dockerfile.9 @@ -2,7 +2,7 @@ # Docker image for almalinux using the rhel template ARG IMAGE_NAME="almalinux" ARG PHP_SERVER="almalinux" -ARG BUILD_DATE="202408111005" +ARG BUILD_DATE="202408111028" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" @@ -71,8 +71,8 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ yum makecache && yum install -yy 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; \