dockers/pixelfed
3
1
Fork 2
Code Issues 6 Pull requests Releases Activity

workaround imagick
All checks were successful
dockers/pixelfed/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
chris 2024-12-11 16:27:00 +01:00
parent 08c3f1f735
commit b9c94ebc84
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Containerfile
View file

@ -15,7 +15,13 @@ RUN set -xe;\
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm &&\ 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 &&\ docker-php-ext-install -j$(nproc) curl zip bcmath intl mbstring xml pcntl gd mysqli pdo_mysql pdo_pgsql opcache &&\
docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql && docker-php-ext-install pdo_pgsql pgsql &&\ docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql && docker-php-ext-install pdo_pgsql pgsql &&\
pecl install imagick &&\ # pecl install imagick &&\ 3.7.0 is broken
git clone https://github.com/Imagick/imagick.git --depth 1 /tmp/imagick &&\
cd /tmp/imagick &&\
git checkout 28f27044e435a2b203e32675e942eb8de620ee58 &&\
phpize && ./configure && make && make install &&\
rm -rf /tmp/imagick &&\
# end workaround
pecl install redis &&\ pecl install redis &&\
docker-php-ext-enable imagick redis docker-php-ext-enable imagick redis
RUN set -xe;\ RUN set -xe;\

8
Containerfile.fpm
View file

@ -14,7 +14,13 @@ RUN set -xe;\
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm &&\ 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 &&\ docker-php-ext-install -j$(nproc) curl zip bcmath intl mbstring xml pcntl gd mysqli pdo_mysql pdo_pgsql opcache &&\
docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql && docker-php-ext-install pdo_pgsql pgsql &&\ docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql && docker-php-ext-install pdo_pgsql pgsql &&\
pecl install imagick &&\ #pecl install imagick &&\ 3.7.0 is broken
git clone https://github.com/Imagick/imagick.git --depth 1 /tmp/imagick &&\
cd /tmp/imagick &&\
git checkout 28f27044e435a2b203e32675e942eb8de620ee58 &&\
phpize && ./configure && make && make install &&\
rm -rf /tmp/imagick &&\
# end workaround
pecl install redis &&\ pecl install redis &&\
docker-php-ext-enable imagick redis docker-php-ext-enable imagick redis
RUN set -xe;\ RUN set -xe;\

2
Jenkinsfile vendored
View file

@ -30,7 +30,6 @@ pipeline {
stage('Build dev arm64') { stage('Build dev arm64') {
steps { steps {
script { script {
sh "echo nop"
sh "TMPDIR=/buildah/tmp buildah bud -f Containerfile --build-arg DATE=$timeStamp --manifest pixelfed-dev --arch arm64" sh "TMPDIR=/buildah/tmp buildah bud -f Containerfile --build-arg DATE=$timeStamp --manifest pixelfed-dev --arch arm64"
} }
} }
@ -45,7 +44,6 @@ pipeline {
stage('Build dev-fpm arm64') { stage('Build dev-fpm arm64') {
steps { steps {
script { script {
sh "echo nop"
sh "TMPDIR=/buildah/tmp buildah bud -f Containerfile.fpm --build-arg DATE=$timeStamp --manifest pixelfed-dev-fpm --arch arm64" sh "TMPDIR=/buildah/tmp buildah bud -f Containerfile.fpm --build-arg DATE=$timeStamp --manifest pixelfed-dev-fpm --arch arm64"
} }
} }