From 2ce8f591ebc050bf0a6e0fba18c8bddb57c7ee69 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Wed, 14 Aug 2024 01:33:08 +0800 Subject: [PATCH] chore(docker): iron out overlay files in pkgops-alpine Also moved intro text to /usr/local/lib/workspace-init-motd file Signed-off-by: Andrei Jiroh Halili --- docker/pkgops-alpine/entrypoint.sh | 12 ++++++++++ .../overlay/local/bin/workspace-init | 23 ------------------- .../overlay/usr/bin/apkbuild-shellcheck | 1 + .../overlay/usr/bin/build-packages | 1 + .../overlay/usr/bin/changed-aports | 1 + docker/pkgops-alpine/overlay/usr/bin/lint | 1 + .../overlay/usr/bin/workspace-init | 1 + .../{ => usr}/local/bin/apkbuild-shellcheck | 0 .../{ => usr}/local/bin/build-packages | 0 .../{ => usr}/local/bin/changed-aports | 0 .../overlay/{ => usr}/local/bin/lint | 0 .../overlay/usr/local/bin/workspace-init | 17 ++++++++++++++ .../overlay/usr/local/lib/workspace-init-motd | 18 +++++++++++++++ 13 files changed, 52 insertions(+), 23 deletions(-) create mode 100755 docker/pkgops-alpine/entrypoint.sh delete mode 100755 docker/pkgops-alpine/overlay/local/bin/workspace-init create mode 120000 docker/pkgops-alpine/overlay/usr/bin/apkbuild-shellcheck create mode 120000 docker/pkgops-alpine/overlay/usr/bin/build-packages create mode 120000 docker/pkgops-alpine/overlay/usr/bin/changed-aports create mode 120000 docker/pkgops-alpine/overlay/usr/bin/lint create mode 120000 docker/pkgops-alpine/overlay/usr/bin/workspace-init rename docker/pkgops-alpine/overlay/{ => usr}/local/bin/apkbuild-shellcheck (100%) rename docker/pkgops-alpine/overlay/{ => usr}/local/bin/build-packages (100%) rename docker/pkgops-alpine/overlay/{ => usr}/local/bin/changed-aports (100%) rename docker/pkgops-alpine/overlay/{ => usr}/local/bin/lint (100%) create mode 100755 docker/pkgops-alpine/overlay/usr/local/bin/workspace-init create mode 100644 docker/pkgops-alpine/overlay/usr/local/lib/workspace-init-motd diff --git a/docker/pkgops-alpine/entrypoint.sh b/docker/pkgops-alpine/entrypoint.sh new file mode 100755 index 0000000..e2cc61b --- /dev/null +++ b/docker/pkgops-alpine/entrypoint.sh @@ -0,0 +1,12 @@ +#!/usr/bin sh + +if [[ $TAILSCALE_AUTHKEY ]]; then + tailscaled --tun=userspace-networking \ + --socks5-server=localhost:1055 \ + --state=${TAILSCALE_STATEDIR:-"mem:"} & + tailscale up --authkey=${TAILSCALE_AUTHKEY} \ + --hostname=${TAILSCALE_HOSTNAME:-"caddy"} \ + --advertise-tags +fi + +caddy run --environ --config ${CADDYFILE_PATH:-"/etc/caddy/Caddyfile"} --adapter caddyfile \ No newline at end of file diff --git a/docker/pkgops-alpine/overlay/local/bin/workspace-init b/docker/pkgops-alpine/overlay/local/bin/workspace-init deleted file mode 100755 index c74c683..0000000 --- a/docker/pkgops-alpine/overlay/local/bin/workspace-init +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env ash -# shellcheck shell=ash - -echo "info: Updating local apk repo cache, this may take a minute..." -doas apk update -echo -echo "info: Fixing permission issues on $HOME, please wait..." -doas chown -R "$(id -u):bulldozer" $HOME -echo -echo "info: Setting user info, just in case..." -git config --global user.name "$GIT_AUTHOR_NAME" -git config --global user.email "$GIT_AUTHOR_EMAIL" -echo -echo "info: To push commits to your fork of aports tree and use GitLab in the command line, please authenicate" -echo "info: your installation of GLab CLI with 'glab auth login' command and configure Git as usual If authenicated" -echo "info: your GLab CLI and configured Git, please disregard this message. You can also opt to push over SSH if you prefer." -echo "info: Happy Aporting!" - -if [ "$1" = "" ]; then - exec ash -l -else - exec "$@" -fi \ No newline at end of file diff --git a/docker/pkgops-alpine/overlay/usr/bin/apkbuild-shellcheck b/docker/pkgops-alpine/overlay/usr/bin/apkbuild-shellcheck new file mode 120000 index 0000000..ae2f73c --- /dev/null +++ b/docker/pkgops-alpine/overlay/usr/bin/apkbuild-shellcheck @@ -0,0 +1 @@ +../local/bin/apkbuild-shellcheck \ No newline at end of file diff --git a/docker/pkgops-alpine/overlay/usr/bin/build-packages b/docker/pkgops-alpine/overlay/usr/bin/build-packages new file mode 120000 index 0000000..561b91c --- /dev/null +++ b/docker/pkgops-alpine/overlay/usr/bin/build-packages @@ -0,0 +1 @@ +../local/bin/build-packages \ No newline at end of file diff --git a/docker/pkgops-alpine/overlay/usr/bin/changed-aports b/docker/pkgops-alpine/overlay/usr/bin/changed-aports new file mode 120000 index 0000000..441b60c --- /dev/null +++ b/docker/pkgops-alpine/overlay/usr/bin/changed-aports @@ -0,0 +1 @@ +../local/bin/changed-aports \ No newline at end of file diff --git a/docker/pkgops-alpine/overlay/usr/bin/lint b/docker/pkgops-alpine/overlay/usr/bin/lint new file mode 120000 index 0000000..460a045 --- /dev/null +++ b/docker/pkgops-alpine/overlay/usr/bin/lint @@ -0,0 +1 @@ +../local/bin/lint \ No newline at end of file diff --git a/docker/pkgops-alpine/overlay/usr/bin/workspace-init b/docker/pkgops-alpine/overlay/usr/bin/workspace-init new file mode 120000 index 0000000..a701575 --- /dev/null +++ b/docker/pkgops-alpine/overlay/usr/bin/workspace-init @@ -0,0 +1 @@ +../local/bin/workspace-init \ No newline at end of file diff --git a/docker/pkgops-alpine/overlay/local/bin/apkbuild-shellcheck b/docker/pkgops-alpine/overlay/usr/local/bin/apkbuild-shellcheck similarity index 100% rename from docker/pkgops-alpine/overlay/local/bin/apkbuild-shellcheck rename to docker/pkgops-alpine/overlay/usr/local/bin/apkbuild-shellcheck diff --git a/docker/pkgops-alpine/overlay/local/bin/build-packages b/docker/pkgops-alpine/overlay/usr/local/bin/build-packages similarity index 100% rename from docker/pkgops-alpine/overlay/local/bin/build-packages rename to docker/pkgops-alpine/overlay/usr/local/bin/build-packages diff --git a/docker/pkgops-alpine/overlay/local/bin/changed-aports b/docker/pkgops-alpine/overlay/usr/local/bin/changed-aports similarity index 100% rename from docker/pkgops-alpine/overlay/local/bin/changed-aports rename to docker/pkgops-alpine/overlay/usr/local/bin/changed-aports diff --git a/docker/pkgops-alpine/overlay/local/bin/lint b/docker/pkgops-alpine/overlay/usr/local/bin/lint similarity index 100% rename from docker/pkgops-alpine/overlay/local/bin/lint rename to docker/pkgops-alpine/overlay/usr/local/bin/lint diff --git a/docker/pkgops-alpine/overlay/usr/local/bin/workspace-init b/docker/pkgops-alpine/overlay/usr/local/bin/workspace-init new file mode 100755 index 0000000..f09ed09 --- /dev/null +++ b/docker/pkgops-alpine/overlay/usr/local/bin/workspace-init @@ -0,0 +1,17 @@ +#!/usr/bin/env sh +# shellcheck shell=sh +SUDO=${SUDO:-"doas"} + +echo "[workspace-init] running container initialization" +$SUDO apk update +$SUDO chown -R "$(id -u):bulldozer" $HOME +git config --global user.name "$GIT_AUTHOR_NAME" +git config --global user.email "$GIT_AUTHOR_EMAIL" +echo +cat /usr/local/lib/workspace-init-motd + +if [ "$1" = "" ]; then + exec ash -l +else + exec "$@" +fi \ No newline at end of file diff --git a/docker/pkgops-alpine/overlay/usr/local/lib/workspace-init-motd b/docker/pkgops-alpine/overlay/usr/local/lib/workspace-init-motd new file mode 100644 index 0000000..c9787dd --- /dev/null +++ b/docker/pkgops-alpine/overlay/usr/local/lib/workspace-init-motd @@ -0,0 +1,18 @@ +Welcome to your aports dev environment in Docker! + +Docs: https://wiki.andreijiroh.xyz/garden/tools/pkgops-alpine-docker +Donate: https://sponsors.andreijiroh.xyz +Community: https://wiki.andreijiroh.xyz/community-hubs + +Working with packages: + + - Build package: cd / && abuild + - Bump versions: abump - + - Use shellcheck: apkbuild-shellcheck + +Using the GitLab CLI: + + - Login: glab auth login -h gitlab.alpinelinux.org + +Report issues at https://mau.dev/andreijiroh-dev/docker-images/issues +or via email at ~ajhalili2006/docker-images@todo.sr.ht. \ No newline at end of file -- 2.51.2