🗃️ Committing everything that changed 🗃️

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
This commit is contained in:
casjay 2024-08-11 10:33:28 -04:00
parent 68ecd36458
commit 24e124947f
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
9 changed files with 20 additions and 18 deletions

View File

@ -1,10 +1,10 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202408111005-git
##@Version : 202408111028-git
# @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@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
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

View File

@ -1,10 +1,10 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202408111005-git
##@Version : 202408111028-git
# @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@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
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

View File

@ -1,10 +1,10 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202408111005-git
##@Version : 202408111028-git
# @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@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
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

View File

@ -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"

View File

@ -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

View File

@ -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 }}

View File

@ -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; \

View File

@ -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; \

View File

@ -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; \