Skip to content

Commit

Permalink
Rebase to Alpine 3.18, deprecate armhf
Browse files Browse the repository at this point in the history
  • Loading branch information
nemchik committed May 27, 2023
1 parent 57a227c commit 4f26c00
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 233 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/issue.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ body:
options:
- x86-64
- arm64
- armhf
validations:
required: true
- type: textarea
Expand Down
36 changes: 15 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18

# set version label
ARG BUILD_DATE
Expand All @@ -11,31 +11,25 @@ LABEL maintainer="thespad"

RUN \
echo "**** install packages ****" && \
apk add --no-cache --upgrade \
apk add --no-cache \
exiftool \
ffmpeg \
imagemagick \
libjpeg-turbo-utils \
mediainfo \
php81-apcu \
php81-cgi \
php81-ctype \
php81-curl \
php81-dom \
php81-exif \
php81-gd \
php81-ldap \
php81-mysqli \
php81-mysqlnd \
php81-pear \
php81-pecl-imagick \
php81-xsl \
php81-zip \
php82-apcu \
php82-cgi \
php82-dom \
php82-exif \
php82-gd \
php82-ldap \
php82-mysqli \
php82-mysqlnd \
php82-pear \
php82-pecl-imagick \
php82-xsl \
poppler-utils \
re2c && \
apk add --no-cache \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
php81-pecl-xmlrpc && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
Expand All @@ -48,9 +42,9 @@ RUN \
unzip -q /tmp/piwigo.zip -d /tmp && \
mv /tmp/piwigo/* /app/www/public && \
# The max filesize is 2M by default, which is way to small for most photos
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php81/php.ini && \
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php82/php.ini && \
# The max post size is 8M by default, it must be at least max_filesize
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php81/php.ini && \
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php82/php.ini && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*
Expand Down
36 changes: 15 additions & 21 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18

# set version label
ARG BUILD_DATE
Expand All @@ -11,31 +11,25 @@ LABEL maintainer="thespad"

RUN \
echo "**** install packages ****" && \
apk add --no-cache --upgrade \
apk add --no-cache \
exiftool \
ffmpeg \
imagemagick \
libjpeg-turbo-utils \
mediainfo \
php81-apcu \
php81-cgi \
php81-ctype \
php81-curl \
php81-dom \
php81-exif \
php81-gd \
php81-ldap \
php81-mysqli \
php81-mysqlnd \
php81-pear \
php81-pecl-imagick \
php81-xsl \
php81-zip \
php82-apcu \
php82-cgi \
php82-dom \
php82-exif \
php82-gd \
php82-ldap \
php82-mysqli \
php82-mysqlnd \
php82-pear \
php82-pecl-imagick \
php82-xsl \
poppler-utils \
re2c && \
apk add --no-cache \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
php81-pecl-xmlrpc && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
Expand All @@ -48,9 +42,9 @@ RUN \
unzip -q /tmp/piwigo.zip -d /tmp && \
mv /tmp/piwigo/* /app/www/public && \
# The max filesize is 2M by default, which is way to small for most photos
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php81/php.ini && \
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php82/php.ini && \
# The max post size is 8M by default, it must be at least max_filesize
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php81/php.ini && \
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php82/php.ini && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*
Expand Down
63 changes: 0 additions & 63 deletions Dockerfile.armhf

This file was deleted.

Loading

0 comments on commit 4f26c00

Please sign in to comment.