dockersrc/archlinux
1
0
Fork 0
mirror of https://github.com/dockersrc/archlinux synced 2025-10-31 02:02:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

🗃️ Committing everything that changed 🗃️
Some checks failed
release-tag / release-image (push) Failing after 12m57s
Details

Browse Source 
Dockerfile
.gitea/workflows/docker.yaml
rootfs/root/docker/setup/03-files.sh
This commit is contained in:
casjay
2024-09-04 12:28:04 -04:00
parent 392d3c59ce
commit 234306134c
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitea/workflows/docker.yaml
View File

@@ -18,10 +18,11 @@ jobs:
- name: Get Meta - name: Get Meta
id: meta id: meta
env: ORG ${{ vars.DOCKER_ORG }}
run: | run: |
echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT
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=$([ -n "$ORG" ] && echo "$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
echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $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 REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT

6
Dockerfile
View File

@@ -14,7 +14,7 @@ ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
ARG USER="root" ARG USER="root"
ARG SHELL_OPTS="set -e -o pipefail" ARG SHELL_OPTS="set -e -o pipefail"
ARG AUR_USER="aur" ARG AUR_USER="aur"
ARG AUR_HOME="/home/aur" ARG AUR_HOME="/var/lib/aur"
ARG SERVICE_PORT="" ARG SERVICE_PORT=""
ARG EXPOSE_PORTS="" ARG EXPOSE_PORTS=""
@@ -67,6 +67,8 @@ ENV TIMEZONE="${TZ}"
ENV LANG="${LANGUAGE}" ENV LANG="${LANGUAGE}"
ENV TERM="xterm-256color" ENV TERM="xterm-256color"
ENV HOSTNAME="casjaysdev-archlinux" ENV HOSTNAME="casjaysdev-archlinux"
ENV AUR_HOME="${AUR_HOME}"
ENV AUR_USER="${AUR_USER}"
USER ${USER} USER ${USER}
WORKDIR /root WORKDIR /root
@@ -158,7 +160,7 @@ RUN echo "Setting up users and scripts "; \
echo 'standard-resolver' >"${AUR_HOME}/.gnupg/dirmngr.conf" && \ echo 'standard-resolver' >"${AUR_HOME}/.gnupg/dirmngr.conf" && \
chown -Rf "${AUR_USER}":"${AUR_USER}" "${AUR_HOME}"; \ chown -Rf "${AUR_USER}":"${AUR_USER}" "${AUR_HOME}"; \
if [ -z "$(command -v yay 2>/dev/null)" ];then cd "${AUR_HOME}/build" && \ if [ -z "$(command -v yay 2>/dev/null)" ];then cd "${AUR_HOME}/build" && \
sudo -u "${AUR_USER}" git clone --depth 1 "https://aur.archlinux.org/yay.git" && cd yay && \ git clone --depth 1 "https://aur.archlinux.org/yay.git" && cd yay && \
sudo -u "${AUR_USER}" makepkg --noconfirm -si; \ sudo -u "${AUR_USER}" makepkg --noconfirm -si; \
fi; \ fi; \
sudo -u "${AUR_USER}" yay --afterclean --removemake --save && pacman -Qtdq | xargs -r pacman --noconfirm -Rcns; \ sudo -u "${AUR_USER}" yay --afterclean --removemake --save && pacman -Qtdq | xargs -r pacman --noconfirm -Rcns; \

6
rootfs/root/docker/setup/03-files.sh
View File

@@ -24,10 +24,12 @@ set -o pipefail
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Set env variables # Set env variables
exitCode=0 exitCode=0
AUR_USER="${AUR_USER:-aur}"
AUR_HOME="${AUR_HOME:-/var/lib/aur}"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Main script # Main script
mkdir -p "${AUR_HOME}/build"
mkdir -p "${AUR_HOME}/.gnupg"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Set the exit code # Set the exit code
exitCode=$? exitCode=$?