Merge pull request #113 from linuxserver/standard-base

Standard base

Author: nemchik

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
 
 # set version label
 ARG BUILD_DATE
@@ -11,56 +11,62 @@ LABEL maintainer="homerr"
 ARG BOOKSTACK_RELEASE
 
 RUN \
-  echo "**** install packages ****" && \
-  apk add --no-cache  \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    composer && \
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
     curl \
-    composer \
     fontconfig \
     memcached \
     netcat-openbsd \
-    php7-ctype \
-    php7-curl \
-    php7-dom \
-    php7-gd \
-    php7-ldap \
-    php7-mbstring \
-    php7-memcached \
-    php7-mysqlnd \
-    php7-openssl \
-    php7-pdo_mysql \
-    php7-phar \
-    php7-simplexml \
-    php7-tokenizer \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-gd \
+    php8-ldap \
+    php8-mbstring \
+    php8-mysqlnd \
+    php8-openssl \
+    php8-pdo_mysql \
+    php8-pecl-memcached \
+    php8-phar \
+    php8-simplexml \
+    php8-tokenizer \
     qt5-qtbase \
     tar \
-    ttf-freefont \
+    ttf-freefont && \
+  apk add --no-cache \
+    --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \
     wkhtmltopdf && \
-  echo "**** configure php-fpm ****" && \
-  sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \
   echo "**** fetch bookstack ****" && \
   mkdir -p\
-    /var/www/html && \
+    /app/www && \
   if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
     BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
-  /tmp/bookstack.tar.gz -L \
+    /tmp/bookstack.tar.gz -L \
     "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
   tar xf \
-  /tmp/bookstack.tar.gz -C \
-    /var/www/html/ --strip-components=1 && \
+    /tmp/bookstack.tar.gz -C \
+    /app/www/ --strip-components=1 && \
   echo "**** install composer dependencies ****" && \
-  composer install -d /var/www/html/ && \
+  composer install -d /app/www/ && \
   echo "**** overlay-fs bug workaround ****" && \
-  mv /var/www /var/www-tmp && \
+  mv /app/www /app/www-tmp && \
   echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
   rm -rf \
     /root/.composer \
     /tmp/*
 
 COPY root/ /
 
-VOLUME /config
-EXPOSE 80
+EXPOSE 80 443

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -11,56 +11,62 @@ LABEL maintainer="homerr"
 ARG BOOKSTACK_RELEASE
 
 RUN \
-  echo "**** install packages ****" && \
-  apk add --no-cache  \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    composer && \
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
     curl \
-    composer \
     fontconfig \
     memcached \
     netcat-openbsd \
-    php7-ctype \
-    php7-curl \
-    php7-dom \
-    php7-gd \
-    php7-ldap \
-    php7-mbstring \
-    php7-memcached \
-    php7-mysqlnd \
-    php7-openssl \
-    php7-pdo_mysql \
-    php7-phar \
-    php7-simplexml \
-    php7-tokenizer \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-gd \
+    php8-ldap \
+    php8-mbstring \
+    php8-mysqlnd \
+    php8-openssl \
+    php8-pdo_mysql \
+    php8-pecl-memcached \
+    php8-phar \
+    php8-simplexml \
+    php8-tokenizer \
     qt5-qtbase \
     tar \
-    ttf-freefont \
+    ttf-freefont && \
+  apk add --no-cache \
+    --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \
     wkhtmltopdf && \
-  echo "**** configure php-fpm ****" && \
-  sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \
   echo "**** fetch bookstack ****" && \
   mkdir -p\
-    /var/www/html && \
+    /app/www && \
   if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
     BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
-  /tmp/bookstack.tar.gz -L \
+    /tmp/bookstack.tar.gz -L \
     "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
   tar xf \
-  /tmp/bookstack.tar.gz -C \
-    /var/www/html/ --strip-components=1 && \
+    /tmp/bookstack.tar.gz -C \
+    /app/www/ --strip-components=1 && \
   echo "**** install composer dependencies ****" && \
-  composer install -d /var/www/html/ && \
+  composer install -d /app/www/ && \
   echo "**** overlay-fs bug workaround ****" && \
-  mv /var/www /var/www-tmp && \
+  mv /app/www /app/www-tmp && \
   echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
   rm -rf \
     /root/.composer \
     /tmp/*
 
 COPY root/ /
 
-VOLUME /config
-EXPOSE 80
+EXPOSE 80 443

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -11,56 +11,62 @@ LABEL maintainer="homerr"
 ARG BOOKSTACK_RELEASE
 
 RUN \
-  echo "**** install packages ****" && \
-  apk add --no-cache  \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    composer && \
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
     curl \
-    composer \
     fontconfig \
     memcached \
     netcat-openbsd \
-    php7-ctype \
-    php7-curl \
-    php7-dom \
-    php7-gd \
-    php7-ldap \
-    php7-mbstring \
-    php7-memcached \
-    php7-mysqlnd \
-    php7-openssl \
-    php7-pdo_mysql \
-    php7-phar \
-    php7-simplexml \
-    php7-tokenizer \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-gd \
+    php8-ldap \
+    php8-mbstring \
+    php8-mysqlnd \
+    php8-openssl \
+    php8-pdo_mysql \
+    php8-pecl-memcached \
+    php8-phar \
+    php8-simplexml \
+    php8-tokenizer \
     qt5-qtbase \
     tar \
-    ttf-freefont \
+    ttf-freefont && \
+  apk add --no-cache \
+    --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \
     wkhtmltopdf && \
-  echo "**** configure php-fpm ****" && \
-  sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \
   echo "**** fetch bookstack ****" && \
   mkdir -p\
-    /var/www/html && \
+    /app/www && \
   if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
     BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
-  /tmp/bookstack.tar.gz -L \
+    /tmp/bookstack.tar.gz -L \
     "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
   tar xf \
-  /tmp/bookstack.tar.gz -C \
-    /var/www/html/ --strip-components=1 && \
+    /tmp/bookstack.tar.gz -C \
+    /app/www/ --strip-components=1 && \
   echo "**** install composer dependencies ****" && \
-  composer install -d /var/www/html/ && \
+  composer install -d /app/www/ && \
   echo "**** overlay-fs bug workaround ****" && \
-  mv /var/www /var/www-tmp && \
+  mv /app/www /app/www-tmp && \
   echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
   rm -rf \
     /root/.composer \
     /tmp/*
 
 COPY root/ /
 
-VOLUME /config
-EXPOSE 80
+EXPOSE 80 443

README.md

@@ -271,6 +271,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
 * **14.03.22:** - Add symlinks for theme support.
 * **11.07.21:** - Rebase to Alpine 3.14.
 * **12.01.21:** - Remove unused requirement, as of release 0.31.0.

readme-vars.yml

@@ -101,6 +101,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
   - { date: "14.03.22:", desc: "Add symlinks for theme support." }
   - { date: "11.07.21:", desc: "Rebase to Alpine 3.14." }
   - { date: "12.01.21:", desc: "Remove unused requirement, as of release 0.31.0." }