diff --git a/.gitattributes b/.gitattributes index 6313b56..4aba44a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ * text=auto eol=lf +/.github export-ignore +/docs export-ignore diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b2fd22..0631eaf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -73,6 +73,7 @@ jobs: BUILD_DATE=${{ env.BUILD_DATE }} BUILD_FINGERPRINT=${{ env.BUILD_FINGERPRINT }} BASE_IMAGE_VERSION=${{ matrix.base_image_version }} + IMAGE_TAG=${{ matrix.release_image_version }} tags: | beeyev/phpmyadmin-lightweight:${{ matrix.release_image_version }} ghcr.io/beeyev/phpmyadmin-docker-lightweight:${{ matrix.release_image_version }} diff --git a/README.md b/README.md index 05d4b0a..80d0538 100644 --- a/README.md +++ b/README.md @@ -1 +1,4 @@ -# phpMyAdmin lightweight +# [phpMyAdmin Docker Lightweight](https://github.com/beeyev/phpmyadmin-docker-lightweight) +> Small + +

diff --git a/docker/Dockerfile b/docker/Dockerfile index 8ab7c3d..dc50e93 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ # docker build -t phpmyadmin-fpm-alpine-caddy --build-arg BUILDKIT_INLINE_CACHE=1 -f ./docker/Dockerfile . && docker run --rm -it -p 8080:80 phpmyadmin-fpm-alpine-caddy -ARG BASE_IMAGE_VERSION=latest +ARG BASE_IMAGE_VERSION FROM phpmyadmin/phpmyadmin:${BASE_IMAGE_VERSION} as phpmyadmin FROM alpine:3 as phpmyadmin-themes @@ -47,9 +47,6 @@ COPY ./docker/config/php-fpm.d/zzz-php-fpm_custom.conf /usr/local/etc/php-fpm.d/ COPY --from=phpmyadmin-themes /src/themes-master/blueberry/ /var/www/html/themes/blueberry/ COPY --from=phpmyadmin-themes /src/themes-master/boodark/ /var/www/html/themes/boodark/ -RUN set -eux \ - && rm -R themes/metro/ themes/bootstrap/ themes/original/ - LABEL org.opencontainers.image.title="phpMyAdmin Docker image" \ org.opencontainers.image.description="Run phpMyAdmin with Alpine, PHP FPM and Caddy" \ org.opencontainers.image.authors="https://github.com/beeyev/phpmyadmin-docker-lightweight" \ @@ -62,6 +59,9 @@ ARG TZ='UTC' ENV TZ=$TZ #These params meant to be set by CI +ARG IMAGE_TAG +ENV IMAGE_TAG=$IMAGE_TAG +RUN echo $IMAGE_TAG ARG BUILD_DATE ENV BUILD_DATE=$BUILD_DATE RUN echo $BUILD_DATE diff --git a/docker/etc/docker-entrypoint.sh b/docker/etc/docker-entrypoint.sh index 02fc192..d51c153 100644 --- a/docker/etc/docker-entrypoint.sh +++ b/docker/etc/docker-entrypoint.sh @@ -20,7 +20,7 @@ for f in /docker-entrypoint.init.d/*; do esac done -printf "\n${GRN}--->${NC} 🚀️️ Welcome to ${GRN}beeyev phpMyAdmin lightweight${NC} container..." +printf "\n${GRN}--->${NC} 🚀️️ Welcome to ${GRN}beeyev phpMyAdmin v.${VERSION} lightweight${NC} container..." printf "\n${GRN}--->${NC} Docker image build date: ${GRN}${BUILD_DATE}${NC}, fingerprint: ${GRN}${BUILD_FINGERPRINT}${NC}" printf "\n${GRN}--->${NC} Subscribe to project updates: ${GRN}https://github.com/beeyev/phpmyadmin-docker-lightweight${NC}\n\n" diff --git a/docs/phpmyadmin-docker-lightweight-withbg.jpg b/docs/phpmyadmin-docker-lightweight-withbg.jpg new file mode 100644 index 0000000..9e032a2 Binary files /dev/null and b/docs/phpmyadmin-docker-lightweight-withbg.jpg differ diff --git a/docs/phpmyadmin-docker-lightweight-withbg.pxz b/docs/phpmyadmin-docker-lightweight-withbg.pxz new file mode 100644 index 0000000..849f5c5 Binary files /dev/null and b/docs/phpmyadmin-docker-lightweight-withbg.pxz differ diff --git a/docs/phpmyadmin-docker-lightweight.png b/docs/phpmyadmin-docker-lightweight.png new file mode 100644 index 0000000..29bca9c Binary files /dev/null and b/docs/phpmyadmin-docker-lightweight.png differ diff --git a/docs/phpmyadmin-docker-lightweight.pxz b/docs/phpmyadmin-docker-lightweight.pxz new file mode 100644 index 0000000..981ecb4 Binary files /dev/null and b/docs/phpmyadmin-docker-lightweight.pxz differ