diff --git a/Containerfile b/Containerfile index 67595d3..4ba0fa9 100644 --- a/Containerfile +++ b/Containerfile @@ -1,5 +1,7 @@ FROM docker.io/php:8.1-apache-bullseye as builder +ARG VERSION=dev + ARG DATE ENV IP_PATCH=14cca91255bca69dec195112ce2fbd110e2406ca @@ -29,6 +31,7 @@ RUN set -xe;\ cd /var && rm -rf www &&\ git clone https://github.com/pixelfed/pixelfed.git www &&\ cd www &&\ + git checkout $VERSION &&\ curl -L https://git.zknt.org/chris/pixelfed/commit/${IP_PATCH}.patch | git apply &&\ curl -L https://git.zknt.org/chris/pixelfed/commit/${DISCOVERY_PATCH}.patch | git apply &&\ curl -L https://git.zknt.org/chris/pixelfed/commit/${GITHUB_PATCH}.patch | git apply &&\ @@ -42,6 +45,7 @@ RUN set -xe;\ FROM docker.io/php:8.1-apache-bullseye ARG DATE +ARG VERSION=dev COPY --from=builder /var/www /var/www COPY entrypoint.sh /entrypoint.sh @@ -68,4 +72,4 @@ WORKDIR /var/www VOLUME /var/www/storage /var/www/bootstrap ENTRYPOINT /entrypoint.sh -LABEL build.date=$DATE +LABEL build.date=$DATE version.pixelfed=$VERSION diff --git a/Containerfile.fpm b/Containerfile.fpm index 0d555a6..213cefb 100644 --- a/Containerfile.fpm +++ b/Containerfile.fpm @@ -1,5 +1,6 @@ FROM docker.io/php:8.1-fpm-bullseye as builder +ARG VERSION=dev ARG DATE ENV IP_PATCH=14cca91255bca69dec195112ce2fbd110e2406ca @@ -29,6 +30,7 @@ RUN set -xe;\ cd /var && rm -rf www &&\ git clone https://github.com/pixelfed/pixelfed.git www &&\ cd www &&\ + git checkout $VERSION &&\ curl -L https://git.zknt.org/chris/pixelfed/commit/${IP_PATCH}.patch | git apply &&\ curl -L https://git.zknt.org/chris/pixelfed/commit/${DISCOVERY_PATCH}.patch | git apply &&\ curl -L https://git.zknt.org/chris/pixelfed/commit/${GITHUB_PATCH}.patch | git apply &&\ @@ -41,6 +43,7 @@ RUN set -xe;\ rm -rf .git tests contrib CHANGELOG.md LICENSE .circleci .dependabot .github CODE_OF_CONDUCT.md .env.docker CONTRIBUTING.md README.md docker-compose.yml .env.testing phpunit.xml .env.example .gitignore .editorconfig .gitattributes .dockerignore FROM docker.io/php:8.1-fpm-bullseye +ARG VERSION=dev ARG DATE COPY --from=builder /var/www /var/www @@ -69,4 +72,4 @@ WORKDIR /var/www VOLUME /var/www/storage /var/www/bootstrap /public ENTRYPOINT /entrypoint.sh -LABEL build.date=$DATE +LABEL build.date=$DATE version.pixelfev=$VERSION