mirror of
https://github.com/dockersrc/archlinux
synced 2024-11-23 17:23:04 -05:00
🗃️ Committing everything that changed 🗃️
Dockerfile .env.scripts .gitea/workflows/docker.yaml
This commit is contained in:
parent
3529ab8799
commit
e550a10cb4
@ -1,10 +1,10 @@
|
|||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202408111007-git
|
##@Version : 202408111050-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : MIT
|
# @@License : MIT
|
||||||
# @@Copyright : Copyright 2024 CasjaysDev
|
# @@Copyright : Copyright 2024 CasjaysDev
|
||||||
# @@Created : Sun Aug 11 10:07:09 AM EDT 2024
|
# @@Created : Sun Aug 11 10:50:58 AM EDT 2024
|
||||||
# @@File : .env.scripts
|
# @@File : .env.scripts
|
||||||
# @@Description : Variables for gen-dockerfile and buildx scripts
|
# @@Description : Variables for gen-dockerfile and buildx scripts
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
@ -19,6 +19,7 @@ jobs:
|
|||||||
- name: Get Meta
|
- name: Get Meta
|
||||||
id: meta
|
id: meta
|
||||||
run: |
|
run: |
|
||||||
|
echo DATE_TAG=$(date +'%y%m')
|
||||||
echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $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_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
|
||||||
echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "latest") >> $GITHUB_OUTPUT
|
echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "latest") >> $GITHUB_OUTPUT
|
||||||
@ -46,4 +47,5 @@ jobs:
|
|||||||
linux/arm64
|
linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: | # replace it with your local IP and tags
|
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 }}
|
${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Docker image for archlinux using the archlinux template
|
# Docker image for archlinux using the archlinux template
|
||||||
ARG IMAGE_NAME="archlinux"
|
ARG IMAGE_NAME="archlinux"
|
||||||
ARG PHP_SERVER="archlinux"
|
ARG PHP_SERVER="archlinux"
|
||||||
ARG BUILD_DATE="202408111007"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
||||||
@ -80,8 +80,8 @@ RUN set -e; \
|
|||||||
pacman-key --populate; \
|
pacman-key --populate; \
|
||||||
echo "installing bash"; \
|
echo "installing bash"; \
|
||||||
pacman -Sy --noconfirm bash; \
|
pacman -Sy --noconfirm bash; \
|
||||||
SH_CMD="$(which sh 2>/dev/null)"; \
|
SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
|
||||||
BASH_CMD="$(which bash 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" "/bin/sh" || true; \
|
||||||
[ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/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; \
|
[ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \
|
||||||
|
Loading…
Reference in New Issue
Block a user