Skip to content

Rebase to 3.16, migrate to s6v3 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thespad merged 5 commits into from
Nov 22, 2022
Merged

Rebase to 3.16, migrate to s6v3 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
381034c
Rebase to 3.16, migrate to s6v3
thespad Nov 18, 2022
1ff394c
Trailing newline
thespad Nov 18, 2022
2bd4795
Increase CI delay
thespad Nov 22, 2022
cfbf822
Only chown the bits of /app we need to
thespad Nov 22, 2022
d5cea1f
Revert CI delay
thespad Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.16

ARG BUILD_DATE
ARG VERSION
Expand All @@ -17,8 +17,6 @@ RUN \
gpg-agent \
gnupg-dirmngr && \
apk add -U --upgrade --no-cache \
curl \
jq \
php8-bz2 \
php8-curl \
php8-dom \
Expand Down
4 changes: 1 addition & 3 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.16
ARG BUILD_DATE
ARG VERSION
ARG PHPMYADMIN_VERSION
Expand All @@ -16,8 +16,6 @@ RUN \
gpg-agent \
gnupg-dirmngr && \
apk add -U --upgrade --no-cache \
curl \
jq \
php8-bz2 \
php8-curl \
php8-dom \
Expand Down
4 changes: 1 addition & 3 deletions Dockerfile.armhf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.16
ARG BUILD_DATE
ARG VERSION
ARG PHPMYADMIN_VERSION
Expand All @@ -16,8 +16,6 @@ RUN \
gpg-agent \
gnupg-dirmngr && \
apk add -U --upgrade --no-cache \
curl \
jq \
php8-bz2 \
php8-curl \
php8-dom \
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **18.11.22:** - Rebasing to Alpine 3.16, migrate to s6v3.
* **20.08.22:** - Rebasing to Alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
* **23.01.22:** - Pin versions to 5.x.x.
* **14.06.21:** - Initial Release.
3 changes: 2 additions & 1 deletion readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ app_setup_block: |

# changelog
changelogs:
- { date: "18.11.22:", desc: "Rebasing to Alpine 3.16, migrate to s6v3." }
- { date: "20.08.22:", desc: "Rebasing to Alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
- { date: "23.01.22:", desc: "Pin versions to 5.x.x." }
- { date: "14.06.21:", desc: "Initial Release." }
- { date: "14.06.21:", desc: "Initial Release." }
Empty file added root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-phpmyadmin-config
View file
Open in desktop
Empty file.
Empty file added root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/dependencies.d/init-config
View file
Open in desktop
Empty file.
11 changes: 6 additions & 5 deletions root/etc/cont-init.d/50-config → ...verlay/s6-rc.d/init-phpmyadmin-config/run
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/with-contenv bash

mkdir -p /config/phpmyadmin
mkdir -p \
/config/phpmyadmin \
/app/www/public/tmp

if [ ! -f /config/phpmyadmin/config.secret.inc.php ]; then
cat > /config/phpmyadmin/config.secret.inc.php <<EOT
Expand All @@ -17,7 +19,6 @@ if [ ! -f /config/phpmyadmin/config.inc.php ]; then
cp /defaults/config.inc.php /config/phpmyadmin/config.inc.php
fi

chown -R abc:abc \
/config

find /app -print0 | xargs -P "$(nproc)" -I {} -0 chown abc:abc {}
lsiown -R abc:abc \
/config \
/app/www/public/tmp
1 change: 1 addition & 0 deletions root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run
Empty file added root/etc/s6-overlay/s6-rc.d/user/contents.d/init-phpmyadmin-config
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion root/migrations/02-default-location
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DEFAULT_CONF="/config/nginx/site-confs/default.conf"
OLD_ROOT="root /app/phpmyadmin;"
NEW_ROOT="root /app/www/public;"

if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}";then
if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null;then
echo "updating root in ${DEFAULT_CONF}"
sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}"
fi