diff --git a/Dockerfile b/Dockerfile index 3493510..240c191 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM php:8.2.18-apache-bookworm +FROM php:8.3.7-apache-bookworm LABEL Maintainer="Libretic" -LABEL Description="Unofficial Docker image for Paheko." +LABEL Description="Official Docker image for Paheko." ENV APACHE_DOCUMENT_ROOT /var/www/paheko/www diff --git a/README.md b/README.md index 7740018..0a21004 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -# Paheko docker image builder +# Paheko docker image -Unofficial [Paheko](https://paheko.cloud/) docker image with plugins based on php official image with apache. +Official [Paheko](https://paheko.cloud/) docker image with plugins, based on php official image with apache. + +[Libretic](https://libretic.fr/) maintains this docker image in collaboration with Paheko. ## How to build image -If you choose to use image from [*Docker Hub*](https://hub.docker.com/r/libretic/paheko), you can skip to next section. +If you choose to use image from [*Docker Hub*](https://hub.docker.com/r/paheko/paheko), you can skip to next section. If you prefer to build your own image with Dockerfile in [*Git repository*](https://git.libretic.fr/libretic/paheko_docker_image_builder), you can do the following. @@ -18,10 +20,10 @@ cd paheko_docker_image_builder * Edit version file to choose your version of paheko -Content of version file for paheko version 1.3.8: +Content of version file for paheko version 1.3.9: ``` -PAHEKO_VERSION=1.3.8 +PAHEKO_VERSION=1.3.9 ``` * Build and tag the image @@ -51,7 +53,7 @@ traefik container on port named "web" (see: [traefik](https://github.com/traefik ``` services: paheko: - image: libretic/paheko + image: paheko/paheko restart: always volumes: - ./config.local.php:/var/www/paheko/config.local.php @@ -61,9 +63,9 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=traefik" - - "traefik.http.routers.demogarradin.entrypoints=web" - - "traefik.http.routers.demogarradin.rule=Host(`my.paheko.fqdn`)" - - "traefik.http.services.demogarradin.loadbalancer.server.port=80" + - "traefik.http.routers.myrouter.entrypoints=web" + - "traefik.http.routers.myrouter.rule=Host(`my.paheko.fqdn`)" + - "traefik.http.services.myrouter.loadbalancer.server.port=80" networks: - traefik @@ -81,7 +83,7 @@ the host running paheko container. ``` services: paheko: - image: libretic/paheko + image: paheko/paheko restart: always volumes: - ./config.local.php:/var/www/paheko/config.local.php @@ -112,6 +114,11 @@ docker compose down ## Change log +* [2024-05-20] + * Upgrade to Paheko version 1.3.9 + * Main hub.docker.com repository migrated from libretic/paheko to paheko/paheko + * Changed base image to php:8.3.7-apache-bookworm + * [2024-04-23] * Upgrade to Paheko version 1.3.8 @@ -120,9 +127,9 @@ docker compose down * Changed base image to php:8.2.18-apache-bookworm -## Acknowledgements +## License -[Paheko](https://paheko.cloud/) is free (FOSS) software. Thanks to Paheko team! +[Paheko](https://paheko.cloud/) is free (FOSS) software, licensed under [AGPL v3](https://www.gnu.org/licenses/why-affero-gpl.fr.html) This builder relies on resources hosted on Paheko's fossil server : diff --git a/build.sh b/build.sh index ba36872..6eb4145 100755 --- a/build.sh +++ b/build.sh @@ -2,4 +2,4 @@ . version -docker build . -t libretic/paheko:$PAHEKO_VERSION --build-arg PAHEKO_VERSION=$PAHEKO_VERSION +docker build . -t paheko/paheko:$PAHEKO_VERSION --build-arg PAHEKO_VERSION=$PAHEKO_VERSION diff --git a/version b/version index 5e70c73..d778770 100644 --- a/version +++ b/version @@ -1 +1 @@ -PAHEKO_VERSION=1.3.8 +PAHEKO_VERSION=1.3.9