diff --git a/Containerfile b/Containerfile new file mode 100644 index 0000000..4ba0fa9 --- /dev/null +++ b/Containerfile @@ -0,0 +1,75 @@ +FROM docker.io/php:8.1-apache-bullseye as builder + +ARG VERSION=dev + +ARG DATE + +ENV IP_PATCH=14cca91255bca69dec195112ce2fbd110e2406ca +ENV DISCOVERY_PATCH=f4a01bc97efeb259fd0c6e2016949c90675cc555 +ENV GITHUB_PATCH=06bcf80133f6c212f1674d280974c669b4524283 +ENV BEAGLE_PATCH=f45a489d5e45de21d648437880ef525a2e957b7b +ENV USERNAME_PATCH=737319bff8697263df19b9b4c0a2ee7cc8055476 + +RUN set -xe;\ + apt-get update &&\ + apt-get install --no-install-recommends -y git locales libcurl4-openssl-dev libzip-dev libicu-dev libxml2-dev libjpeg62-turbo-dev libpng-dev libmagickwand-dev libpq-dev libxpm-dev libwebp-dev &&\ + apt-get clean all &&\ + rm -rf /var/lib/apt/lists/* + +RUN set -xe;\ + docker-php-ext-configure mbstring --disable-mbregex &&\ + docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm &&\ + docker-php-ext-install -j$(nproc) curl zip bcmath intl mbstring xml pcntl gd mysqli pdo_mysql pdo_pgsql opcache &&\ + pecl install imagick &&\ + pecl install redis &&\ + docker-php-ext-enable imagick redis +RUN set -xe;\ + curl https://raw.githubusercontent.com/composer/getcomposer.org/0a51b6fe383f7f61cf1d250c742ec655aa044c94/web/installer | php -- --quiet --2.2 &&\ + mv composer.phar /usr/local/bin/composer + +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 &&\ + curl -L https://git.zknt.org/chris/pixelfed/commit/${BEAGLE_PATCH}.patch | git apply &&\ + curl -L https://git.zknt.org/chris/pixelfed/commit/${USERNAME_PATCH}.patch | git apply &&\ + composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\ + ln -s public html &&\ + chown -R www-data:www-data /var/www &&\ + cp -r storage storage.skel &&\ + 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-apache-bullseye +ARG DATE +ARG VERSION=dev + +COPY --from=builder /var/www /var/www +COPY entrypoint.sh /entrypoint.sh +COPY worker-entrypoint.sh /worker-entrypoint.sh +COPY websockets-entrypoint.sh /websockets-entrypoint.sh +COPY wait-for-db.php /wait-for-db.php +COPY --from=builder /usr/local/lib/php/extensions/no-debug-non-zts-20210902 /usr/local/lib/php/extensions/no-debug-non-zts-20210902 +COPY --from=builder /usr/local/etc/php/conf.d /usr/local/etc/php/conf.d + +RUN set -xe;\ + apt-get update &&\ + apt-get install --no-install-recommends -y libzip4 libpq5 libmagickwand-6.q16-6 libxpm4 libwebp6 &&\ + apt-get install --no-install-recommends -y optipng pngquant jpegoptim gifsicle ffmpeg locales gosu dumb-init &&\ + apt-get clean all &&\ + rm -rf /var/lib/apt/lists/* + +RUN set -xe;\ + a2enmod rewrite &&\ + sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf &&\ + sed -i 's/^post_max_size.*/post_max_size = 100M/g' "$PHP_INI_DIR"/php.ini* &&\ + sed -i 's/^upload_max_filesize.*/upload_max_filesize = 100M/g' "$PHP_INI_DIR"/php.ini* &&\ + mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" +WORKDIR /var/www +VOLUME /var/www/storage /var/www/bootstrap +ENTRYPOINT /entrypoint.sh + +LABEL build.date=$DATE version.pixelfed=$VERSION diff --git a/Containerfile.fpm b/Containerfile.fpm new file mode 100644 index 0000000..213cefb --- /dev/null +++ b/Containerfile.fpm @@ -0,0 +1,75 @@ +FROM docker.io/php:8.1-fpm-bullseye as builder + +ARG VERSION=dev +ARG DATE + +ENV IP_PATCH=14cca91255bca69dec195112ce2fbd110e2406ca +ENV DISCOVERY_PATCH=f4a01bc97efeb259fd0c6e2016949c90675cc555 +ENV GITHUB_PATCH=06bcf80133f6c212f1674d280974c669b4524283 +ENV BEAGLE_PATCH=f45a489d5e45de21d648437880ef525a2e957b7b +ENV USERNAME_PATCH=737319bff8697263df19b9b4c0a2ee7cc8055476 + +RUN set -xe;\ + apt-get update &&\ + apt-get install --no-install-recommends -y git locales libcurl4-openssl-dev libzip-dev libicu-dev libxml2-dev libjpeg62-turbo-dev libpng-dev libmagickwand-dev libpq-dev libxpm-dev libwebp-dev &&\ + apt-get clean all &&\ + rm -rf /var/lib/apt/lists/* + +RUN set -xe;\ + docker-php-ext-configure mbstring --disable-mbregex &&\ + docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm &&\ + docker-php-ext-install -j$(nproc) curl zip bcmath intl mbstring xml pcntl gd mysqli pdo_mysql pdo_pgsql opcache &&\ + pecl install imagick &&\ + pecl install redis &&\ + docker-php-ext-enable imagick redis +RUN set -xe;\ + curl https://raw.githubusercontent.com/composer/getcomposer.org/0a51b6fe383f7f61cf1d250c742ec655aa044c94/web/installer | php -- --quiet --2.2 &&\ + mv composer.phar /usr/local/bin/composer + +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 &&\ + curl -L https://git.zknt.org/chris/pixelfed/commit/${BEAGLE_PATCH}.patch | git apply &&\ + curl -L https://git.zknt.org/chris/pixelfed/commit/${USERNAME_PATCH}.patch | git apply &&\ + composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\ + ln -s public html &&\ + chown -R www-data:www-data /var/www &&\ + cp -r storage storage.skel &&\ + 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 +COPY entrypoint.fpm.sh /entrypoint.sh +COPY worker-entrypoint.sh /worker-entrypoint.sh +COPY websockets-entrypoint.sh /websockets-entrypoint.sh +COPY wait-for-db.php /wait-for-db.php +COPY --from=builder /usr/local/lib/php/extensions/no-debug-non-zts-20210902 /usr/local/lib/php/extensions/no-debug-non-zts-20210902 +COPY --from=builder /usr/local/etc/php/conf.d /usr/local/etc/php/conf.d + +RUN set -xe;\ + apt-get update &&\ + apt-get upgrade -y &&\ + apt-get install --no-install-recommends -y libzip4 libpq5 libmagickwand-6.q16-6 libxpm4 libwebp6 &&\ + apt-get install --no-install-recommends -y optipng pngquant jpegoptim gifsicle ffmpeg locales gosu dumb-init rsync &&\ + apt-get clean all &&\ + rm -rf /var/lib/apt/lists/* + +RUN set -xe;\ +# a2enmod rewrite &&\ +# sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf &&\ + sed -i 's/^post_max_size.*/post_max_size = 100M/g' "$PHP_INI_DIR"/php.ini* &&\ + sed -i 's/^upload_max_filesize.*/upload_max_filesize = 100M/g' "$PHP_INI_DIR"/php.ini* &&\ + mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" +WORKDIR /var/www +VOLUME /var/www/storage /var/www/bootstrap /public +ENTRYPOINT /entrypoint.sh + +LABEL build.date=$DATE version.pixelfev=$VERSION diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 1754552..0000000 --- a/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM reg.zknt.org/zknt/debian-php:8.1 as builder - -ARG DATE - -ENV PHPVER=8.1 -ENV IP_PATCH=14cca91255bca69dec195112ce2fbd110e2406ca -ENV DISCOVERY_PATCH=f4a01bc97efeb259fd0c6e2016949c90675cc555 -ENV GITHUB_PATCH=06bcf80133f6c212f1674d280974c669b4524283 -ENV BEAGLE_PATCH=f45a489d5e45de21d648437880ef525a2e957b7b -ENV USERNAME_PATCH=737319bff8697263df19b9b4c0a2ee7cc8055476 - -RUN set -xe;\ - apt-install git unzip php${PHPVER}-curl php${PHPVER}-zip php${PHPVER}-bcmath php${PHPVER}-intl php${PHPVER}-mbstring php${PHPVER}-xml -RUN set -xe;\ - curl https://raw.githubusercontent.com/composer/getcomposer.org/0a51b6fe383f7f61cf1d250c742ec655aa044c94/web/installer | php -- --quiet --2.2 &&\ - mv composer.phar /usr/local/bin/composer -RUN set -xe;\ - cd /var && rm -rf www &&\ - git clone https://github.com/pixelfed/pixelfed.git www &&\ - cd www &&\ - curl -L https://github.com/hnrd/pixelfed/commit/${IP_PATCH}.patch | git apply &&\ - curl -L https://github.com/hnrd/pixelfed/commit/${DISCOVERY_PATCH}.patch | git apply &&\ - curl -L https://github.com/hnrd/pixelfed/commit/${GITHUB_PATCH}.patch | git apply &&\ - curl -L https://github.com/hnrd/pixelfed/commit/${BEAGLE_PATCH}.patch | git apply &&\ - curl -L https://github.com/hnrd/pixelfed/commit/${USERNAME_PATCH}.patch | git apply &&\ - composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\ - ln -s public html &&\ - chown -R www-data:www-data /var/www &&\ - cp -r storage storage.skel &&\ - 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 reg.zknt.org/zknt/debian-php:8.1 -ENV PHPVER=8.1 -COPY --from=builder /var/www /var/www -COPY entrypoint.sh /entrypoint.sh -COPY worker-entrypoint.sh /worker-entrypoint.sh -COPY websockets-entrypoint.sh /websockets-entrypoint.sh -COPY wait-for-db.php /wait-for-db.php -RUN apt-install php${PHPVER}-curl php${PHPVER}-zip php${PHPVER}-bcmath php${PHPVER}-intl php${PHPVER}-mbstring php${PHPVER}-xml optipng pngquant jpegoptim gifsicle ffmpeg php${PHPVER}-imagick php${PHPVER}-gd php${PHPVER}-redis php${PHPVER}-mysql php${PHPVER}-pgsql &&\ - a2enmod rewrite &&\ - sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf &&\ - sed -i 's/^post_max_size.*/post_max_size = 100M/g' /etc/php/${PHPVER}/apache2/php.ini &&\ - sed -i 's/^upload_max_filesize.*/upload_max_filesize = 100M/g' /etc/php/${PHPVER}/apache2/php.ini -WORKDIR /var/www -VOLUME /var/www/storage /var/www/bootstrap -ENTRYPOINT /entrypoint.sh - -LABEL build.date=$DATE diff --git a/Jenkinsfile b/Jenkinsfile index 0d76b9d..43455f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,41 +2,45 @@ version = "" project = "pixelfed" repo = "zknt" registry = "reg.zknt.org" -registry_credentials = "6ff44976-23cd-4cc2-902c-de8c340e65e5" timeStamp = Calendar.getInstance().getTime().format('YYYY-MM-dd',TimeZone.getTimeZone('UTC')) pipeline { agent any - triggers { - upstream(upstreamProjects: "../debian-php-81/trunk", threshold: hudson.model.Result.SUCCESS) + environment { + ZKNT_CRED = credentials("6ff44976-23cd-4cc2-902c-de8c340e65e5") + IO_CRED = credentials("3deeee3d-6fce-4430-98dd-9b4db56f43f7") + QUAY_CRED = credentials("18fb6f7e-c6bc-4d06-9bf9-08c2af6bfc1a") } stages { stage('Build image') { steps { - withDockerRegistry([ credentialsId: registry_credentials, url: "https://"+registry ]) { - script { - version = timeStamp - def customImage = docker.build(registry+'/'+repo+'/'+project, "--pull --build-arg VERSION=$version --build-arg DATE=$timeStamp .") - customImage.push(version) - customImage.push("latest") - def io_registry_credentials = "3deeee3d-6fce-4430-98dd-9b4db56f43f7" - withDockerRegistry([ credentialsId: io_registry_credentials ]) { - def io_registry_image = repo + '/' + project + ':' + version - sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image - sh "docker push " + io_registry_image - sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image.split(/\:/)[0] + ":latest" - sh "docker push " + io_registry_image.split(/\:/)[0] + ":latest" - } - - def quay_credentials= "18fb6f7e-c6bc-4d06-9bf9-08c2af6bfc1a" - withDockerRegistry([ credentialsId: quay_credentials, url: "https://quay.io" ]) { - def quay_image = 'quay.io/' + repo + '/' + project + ':' + version - sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image - sh "docker push " + quay_image - sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image.split(/\:/)[0] + ":latest" - sh "docker push " + quay_image.split(/\:/)[0] + ":latest" - } - } + script { + sh "buildah login -u " + ZKNT_CRED_USR + " -p " + ZKNT_CRED_PSW + " reg.zknt.org" + def image = registry + '/' + repo + '/' + project + sh "buildah bud -f Containerfile --build-arg DATE=$timeStamp -t pixelfed:test" + sh "buildah bud -f Containerfile.fpm --build-arg DATE=$timeStamp -t pixelfed:fpm" + sh "buildah tag pixelfed:test reg.zknt.org/zknt/pixelfed:test" + sh "buildah tag pixelfed:test reg.zknt.org/zknt/pixelfed:fpm" + sh "buildah push " + image + ':test' + sh "buildah push " + image + ':fpm' + } + script { + sh "buildah login -u " + IO_CRED_USR+ " -p " + IO_CRED_PSW + " docker.io" + sh "buildah tag pixelfed:test docker.io/zknt/pixelfed:test" + sh "buildah tag pixelfed:fpm docker.io/zknt/pixelfed:fpm" + sh "buildah tag pixelfed:fpm docker.io/zknt/pixelfed:fpm-"+timeStamp + sh "buildah push docker.io/zknt/pixelfed:test" + sh "buildah push docker.io/zknt/pixelfed:fpm" + sh "buildah push docker.io/zknt/pixelfed:fpm-"+timeStamp + } + script { + sh "buildah login -u " + QUAY_CRED_USR+ " -p " + QUAY_CRED_PSW + " quay.io" + sh "buildah tag pixelfed:test quay.io/zknt/pixelfed:test" + sh "buildah tag pixelfed:fpm quay.io/zknt/pixelfed:fpm" + sh "buildah tag pixelfed:fpm quay.io/zknt/pixelfed:fpm-"+timeStamp + sh "buildah push quay.io/zknt/pixelfed:test" + sh "buildah push quay.io/zknt/pixelfed:fpm" + sh "buildah push quay.io/zknt/pixelfed:fpm-"+timeStamp } } } @@ -44,11 +48,8 @@ pipeline { post { always { - sh """docker container prune -f""" - sh """docker image prune -f""" - sh """docker rmi -f \$(docker images -q $registry/$repo/$project:$version)""" - sh """for image in \$(grep FROM Dockerfile | cut -d ' ' -f 2 | grep -vi -e SCRATCH -e bootstrapped | uniq); do docker rmi -f \$(docker images -q \${image}); done""" - emailext body: 'build finished', subject: '[jenkins] docker '+project+'('+version+'): ' + currentBuild.result, to: 'cg@zknt.org', from: 'sysadm@zknt.org', attachLog: true + sh """buildah rmi -af""" + emailext body: 'build finished', subject: '[jenkins] docker '+project+'('+timeStamp+'-test): ' + currentBuild.result, to: 'cg@zknt.org', from: 'sysadm@zknt.org', attachLog: true } } options { @@ -75,4 +76,4 @@ pipeline { ] ])) } -} \ No newline at end of file +} diff --git a/asset-notes.txt b/asset-notes.txt deleted file mode 100644 index bfdbb05..0000000 --- a/asset-notes.txt +++ /dev/null @@ -1,34 +0,0 @@ -# compile assets - -add to webpack.mix.js: `.js('resources/assets/js/components/**/*.vue', 'public/js').vue()` -oder nur .vue()? - - - composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader - npm install - export PATH=$(pwd)/node_modules/.bin:$PATH - mix --production - - -[webpack-cli] Error: Prevent writing to file that only differs in casing or query string from already written file. -This will lead to a race-condition and corrupted files on case-insensitive file systems. -/pixelfed/public/js/Activity.js -/pixelfed/public/js/activity.js - at checkSimilarFile (/pixelfed/node_modules/webpack/lib/Compiler.js:666:11) - at writeOut (/pixelfed/node_modules/webpack/lib/Compiler.js:848:11) - at /pixelfed/node_modules/webpack/lib/util/fs.js:242:5 - at FSReqCallback.oncomplete (node:fs:189:23) - - -apk add php7 git npm -apk add php7-json php7-phar php7-mbstring php7-openssl php7-dom php7-simplexml php7-xmlreader php7-zip php7-fileinfo php7-curl php7-tokenizer php7-bcmath php7-intl php7-pcntl php7-sodium php7-pdo php7-posix -curl -s https://getcomposer.org/installer | php -mv composer.phar /usr/local/bin/composer -git clone https://github.com/pixelfed/pixelfed.git -cd /pixelfed -composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader -npm install -rm -rf public/js -export PATH=$(pwd)/node_modules/.bin:$PATH -sed -i "s/.extract([/a.vue().extract([/" webpack.mix.js -mix --production diff --git a/entrypoint.fpm.sh b/entrypoint.fpm.sh new file mode 100755 index 0000000..8bcdfff --- /dev/null +++ b/entrypoint.fpm.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +set -xeo pipefail + +cp -r storage.skel/* storage/ +chown -R www-data:www-data storage/ bootstrap/ + +php /wait-for-db.php + +if [[ ! -e storage/.docker.init ]] +then + echo "Fresh installation, initializing database..." + gosu www-data php artisan key:generate + gosu www-data php artisan migrate:fresh --force + gosu www-data php artisan passport:keys + echo completed > storage/.docker.init +fi + +gosu www-data php artisan storage:link +gosu www-data php artisan horizon:publish +gosu www-data php artisan config:cache +gosu www-data php artisan cache:clear +gosu www-data php artisan route:cache +gosu www-data php artisan view:cache + +rsync --archive --delete public/ /public/ + +echo "++++ Check for needed migrations... ++++" +# check for migrations +gosu www-data php artisan migrate:status | grep No && migrations=yes || migrations=no +gosu www-data php artisan migrate:status | grep Pending && migrations=yes || migrations=no +if [ "$migrations" = "yes" ]; +then + gosu www-data php artisan migrate --force +fi + +# create instance actor +gosu www-data php artisan instance:actor + +dumb-init docker-php-entrypoint -F diff --git a/entrypoint.sh b/entrypoint.sh index 5f92f49..a496af4 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -7,6 +7,7 @@ then fi cp -r storage.skel/* storage/ +chown -R www-data:www-data storage/ bootstrap/ php /wait-for-db.php @@ -40,4 +41,4 @@ gosu www-data php artisan instance:actor echo "++++ Start apache... ++++" source /etc/apache2/envvars -/usr/local/sbin/dumb-init apache2 -DFOREGROUND +dumb-init apache2 -DFOREGROUND