Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2de8755

Browse files
thespadthespad
committedMay 24, 2024
Rebase to 3.20
1 parent 46ea1ca commit 2de8755

6 files changed

+30
-49
lines changed
 

‎Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
44

55
# set version label
66
ARG BUILD_DATE
77
ARG VERSION
88
ARG PHPMYADMIN_VERSION
99
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
10-
LABEL maintainer="TheSpad"
10+
LABEL maintainer="thespad"
1111

1212
# environment settings
1313
ARG PHPMYADMIN_RELEASE_GPG_KEY="3D06A59ECE730EB71B511C17CE752F178259BD92"
@@ -32,7 +32,7 @@ RUN \
3232
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
3333
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
3434
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
35-
echo "**** setup php opcache ****" && \
35+
echo "**** setup php opcache ****" && \
3636
{ \
3737
echo 'opcache.memory_consumption=128'; \
3838
echo 'opcache.interned_strings_buffer=8'; \
@@ -78,7 +78,8 @@ RUN \
7878
tar xf \
7979
/tmp/phpmyadmin.tar.xz -C \
8080
/app/www/public/ --strip-components=1 && \
81-
sed -i "s@'configFile' =>.*@'configFile' => '/config/phpmyadmin/config.inc.php',@" "/app/www/public/libraries/vendor_config.php" && \
81+
sed -i "s@'configFile' =>.*@'configFile' => '/config/phpmyadmin/config.inc.php',@" "/app/www/public/libraries/vendor_config.php" && \
82+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
8283
echo "**** cleanup ****" && \
8384
apk del --purge \
8485
build-dependencies && \

‎Dockerfile.aarch64

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
44

55
# set version label
66
ARG BUILD_DATE
77
ARG VERSION
88
ARG PHPMYADMIN_VERSION
99
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
10-
LABEL maintainer="TheSpad"
10+
LABEL maintainer="thespad"
1111

1212
# environment settings
1313
ARG PHPMYADMIN_RELEASE_GPG_KEY="3D06A59ECE730EB71B511C17CE752F178259BD92"
@@ -32,7 +32,7 @@ RUN \
3232
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
3333
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
3434
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
35-
echo "**** setup php opcache ****" && \
35+
echo "**** setup php opcache ****" && \
3636
{ \
3737
echo 'opcache.memory_consumption=128'; \
3838
echo 'opcache.interned_strings_buffer=8'; \
@@ -78,8 +78,9 @@ RUN \
7878
tar xf \
7979
/tmp/phpmyadmin.tar.xz -C \
8080
/app/www/public/ --strip-components=1 && \
81-
sed -i "s@'configFile' =>.*@'configFile' => '/config/phpmyadmin/config.inc.php',@" "/app/www/public/libraries/vendor_config.php" && \
82-
echo "**** cleanup ****" && \
81+
sed -i "s@'configFile' =>.*@'configFile' => '/config/phpmyadmin/config.inc.php',@" "/app/www/public/libraries/vendor_config.php" && \
82+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
83+
echo "**** cleanup ****" && \
8384
apk del --purge \
8485
build-dependencies && \
8586
rm -rf \

‎Jenkinsfile

+13-32
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ pipeline {
3333
CI_WEB='true'
3434
CI_PORT='80'
3535
CI_SSL='false'
36-
CI_DELAY='120'
37-
CI_DOCKERENV='TZ=US/Pacific'
36+
CI_DELAY='60'
37+
CI_DOCKERENV=''
3838
CI_AUTH=''
3939
CI_WEBPATH=''
4040
}
@@ -298,7 +298,7 @@ pipeline {
298298
echo "Jenkinsfile is up to date."
299299
fi
300300
echo "Starting Stage 2 - Delete old templates"
301-
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
301+
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
302302
for i in ${OLD_TEMPLATES}; do
303303
if [[ -f "${i}" ]]; then
304304
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -528,6 +528,7 @@ pipeline {
528528
--label \"org.opencontainers.image.title=Phpmyadmin\" \
529529
--label \"org.opencontainers.image.description=[Phpmyadmin](https://github.com/phpmyadmin/phpmyadmin/) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. \" \
530530
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
531+
--provenance=false --sbom=false \
531532
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
532533
}
533534
}
@@ -559,6 +560,7 @@ pipeline {
559560
--label \"org.opencontainers.image.title=Phpmyadmin\" \
560561
--label \"org.opencontainers.image.description=[Phpmyadmin](https://github.com/phpmyadmin/phpmyadmin/) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. \" \
561562
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
563+
--provenance=false --sbom=false \
562564
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
563565
}
564566
}
@@ -587,6 +589,7 @@ pipeline {
587589
--label \"org.opencontainers.image.title=Phpmyadmin\" \
588590
--label \"org.opencontainers.image.description=[Phpmyadmin](https://github.com/phpmyadmin/phpmyadmin/) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. \" \
589591
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
592+
--provenance=false --sbom=false \
590593
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
591594
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
592595
retry(5) {
@@ -710,7 +713,7 @@ pipeline {
710713
--shm-size=1gb \
711714
-v /var/run/docker.sock:/var/run/docker.sock \
712715
-e IMAGE=\"${IMAGE}\" \
713-
-e DELAY_START=\"${CI_DELAY}\" \
716+
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
714717
-e TAGS=\"${CI_TAGS}\" \
715718
-e META_TAG=\"${META_TAG}\" \
716719
-e PORT=\"${CI_PORT}\" \
@@ -818,35 +821,13 @@ pipeline {
818821
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
819822
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
820823
fi
821-
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
822-
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
823-
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
824-
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
825-
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
826-
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
827-
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
828-
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
829-
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
830-
if [ -n "${SEMVER}" ]; then
831-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
832-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
833-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
834-
fi
835-
token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
836-
digest=$(curl -s \
837-
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
838-
--header "Authorization: Bearer ${token}" \
839-
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
840-
if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
841-
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
842-
docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
843-
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
844-
fi
845-
docker manifest push --purge ${MANIFESTIMAGE}:latest
846-
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
847-
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
824+
done
825+
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
826+
docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
827+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
828+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
848829
if [ -n "${SEMVER}" ]; then
849-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
830+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
850831
fi
851832
done
852833
'''

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Find us at:
2828

2929
# [linuxserver/phpmyadmin](https://github.com/linuxserver/docker-phpmyadmin)
3030

31-
[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fphpmyadmin?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fphpmyadmin)
31+
[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fphpmyadmin?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
3232
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-phpmyadmin.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-phpmyadmin)
3333
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-phpmyadmin.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-phpmyadmin/releases)
3434
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-phpmyadmin/packages)
@@ -281,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
281281

282282
## Versions
283283

284+
* **24.05.24:** - Rebase to Alpine 3.20.
284285
* **28.12.23:** - Rebase to Alpine 3.19 with php 8.3.
285286
* **25.12.23:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
286287
* **06.09.23:** - Add support for custom themes.

‎jenkins-vars.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ custom_version_command: "curl -sL 'https://www.phpmyadmin.net/home_page/version.
77
release_type: stable
88
release_tag: latest
99
ls_branch: main
10-
build_armhf: false
1110
repo_vars:
1211
- EXT_GIT_BRANCH = 'master'
1312
- EXT_USER = 'phpmyadmin'
@@ -25,8 +24,7 @@ repo_vars:
2524
- CI_WEB='true'
2625
- CI_PORT='80'
2726
- CI_SSL='false'
28-
- CI_DELAY='120'
29-
- CI_DOCKERENV='TZ=US/Pacific'
27+
- CI_DELAY='60'
28+
- CI_DOCKERENV=''
3029
- CI_AUTH=''
3130
- CI_WEBPATH=''
32-

‎readme-vars.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ available_architectures:
1818
common_param_env_vars_enabled: true
1919
param_container_name: "{{ project_name }}"
2020

21-
param_usage_include_env: true
22-
param_env_vars:
23-
- { env_var: "TZ", env_value: "America/New_York", desc: "Specify a timezone to use EG America/New_York"}
21+
param_usage_include_env: false
2422

2523
opt_param_usage_include_env: true
2624
opt_param_env_vars:
@@ -46,6 +44,7 @@ app_setup_block: |
4644
4745
# changelog
4846
changelogs:
47+
- { date: "24.05.24:", desc: "Rebase to Alpine 3.20." }
4948
- { date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3." }
5049
- { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
5150
- { date: "06.09.23:", desc: "Add support for custom themes." }

0 commit comments

Comments
 (0)
Failed to load comments.