diff --git a/Dockerfile b/Dockerfile index 43b1d88..74ea677 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 # set version label ARG BUILD_DATE @@ -12,79 +12,79 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 # install packages RUN \ - apk add --no-cache --upgrade \ - curl && \ - if [ -z ${NGINX_VERSION+x} ]; then \ - NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ - && awk '/^P:nginx$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ - fi && \ - apk add --no-cache --upgrade \ - memcached \ - nginx==${NGINX_VERSION} \ - nginx-mod-http-brotli==${NGINX_VERSION} \ - nginx-mod-http-dav-ext==${NGINX_VERSION} \ - nginx-mod-http-echo==${NGINX_VERSION} \ - nginx-mod-http-fancyindex==${NGINX_VERSION} \ - nginx-mod-http-geoip==${NGINX_VERSION} \ - nginx-mod-http-geoip2==${NGINX_VERSION} \ - nginx-mod-http-headers-more==${NGINX_VERSION} \ - nginx-mod-http-image-filter==${NGINX_VERSION} \ - nginx-mod-http-nchan==${NGINX_VERSION} \ - nginx-mod-http-perl==${NGINX_VERSION} \ - nginx-mod-http-redis2==${NGINX_VERSION} \ - nginx-mod-http-set-misc==${NGINX_VERSION} \ - nginx-mod-http-upload-progress==${NGINX_VERSION} \ - nginx-mod-http-xslt-filter==${NGINX_VERSION} \ - nginx-mod-mail==${NGINX_VERSION} \ - nginx-mod-rtmp==${NGINX_VERSION} \ - nginx-mod-stream==${NGINX_VERSION} \ - nginx-mod-stream-geoip==${NGINX_VERSION} \ - nginx-mod-stream-geoip2==${NGINX_VERSION} \ - nginx-vim==${NGINX_VERSION} \ - php7-bcmath \ - php7-bz2 \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-exif \ - php7-ftp \ - php7-gd \ - php7-gmp \ - php7-iconv \ - php7-imap \ - php7-intl \ - php7-ldap \ - php7-mcrypt \ - php7-memcached \ - php7-mysqli \ - php7-mysqlnd \ - php7-opcache \ - php7-pdo_mysql \ - php7-pdo_odbc \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-pear \ - php7-pecl-apcu \ - php7-pecl-mailparse \ - php7-pecl-redis \ - php7-pgsql \ - php7-phar \ - php7-posix \ - php7-soap \ - php7-sockets \ - php7-sodium \ - php7-sqlite3 \ - php7-tokenizer \ - php7-xml \ - php7-xmlreader \ - php7-xmlrpc \ - php7-xsl \ - php7-zip && \ - echo "**** configure nginx ****" && \ - rm -f /etc/nginx/http.d/default.conf && \ - sed -i \ - 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \ - /defaults/nginx.conf + apk add --no-cache --upgrade \ + curl && \ + if [ -z ${NGINX_VERSION+x} ]; then \ + NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:nginx$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ + fi && \ + apk add --no-cache --upgrade \ + memcached \ + nginx==${NGINX_VERSION} \ + nginx-mod-http-brotli==${NGINX_VERSION} \ + nginx-mod-http-dav-ext==${NGINX_VERSION} \ + nginx-mod-http-echo==${NGINX_VERSION} \ + nginx-mod-http-fancyindex==${NGINX_VERSION} \ + nginx-mod-http-geoip==${NGINX_VERSION} \ + nginx-mod-http-geoip2==${NGINX_VERSION} \ + nginx-mod-http-headers-more==${NGINX_VERSION} \ + nginx-mod-http-image-filter==${NGINX_VERSION} \ + nginx-mod-http-nchan==${NGINX_VERSION} \ + nginx-mod-http-perl==${NGINX_VERSION} \ + nginx-mod-http-redis2==${NGINX_VERSION} \ + nginx-mod-http-set-misc==${NGINX_VERSION} \ + nginx-mod-http-upload-progress==${NGINX_VERSION} \ + nginx-mod-http-xslt-filter==${NGINX_VERSION} \ + nginx-mod-mail==${NGINX_VERSION} \ + nginx-mod-rtmp==${NGINX_VERSION} \ + nginx-mod-stream==${NGINX_VERSION} \ + nginx-mod-stream-geoip==${NGINX_VERSION} \ + nginx-mod-stream-geoip2==${NGINX_VERSION} \ + nginx-vim==${NGINX_VERSION} \ + php7-bcmath \ + php7-bz2 \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-exif \ + php7-ftp \ + php7-gd \ + php7-gmp \ + php7-iconv \ + php7-imap \ + php7-intl \ + php7-ldap \ + php7-mcrypt \ + php7-memcached \ + php7-mysqli \ + php7-mysqlnd \ + php7-opcache \ + php7-pdo_mysql \ + php7-pdo_odbc \ + php7-pdo_pgsql \ + php7-pdo_sqlite \ + php7-pear \ + php7-pecl-apcu \ + php7-pecl-mailparse \ + php7-pecl-redis \ + php7-pgsql \ + php7-phar \ + php7-posix \ + php7-soap \ + php7-sockets \ + php7-sodium \ + php7-sqlite3 \ + php7-tokenizer \ + php7-xml \ + php7-xmlreader \ + php7-xmlrpc \ + php7-xsl \ + php7-zip && \ + echo "**** configure nginx ****" && \ + rm -f /etc/nginx/http.d/default.conf && \ + sed -i \ + 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \ + /defaults/nginx.conf # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a982803..5bae014 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.13 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14 # set version label ARG BUILD_DATE @@ -12,79 +12,79 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 # install packages RUN \ - apk add --no-cache --upgrade \ - curl && \ - if [ -z ${NGINX_VERSION+x} ]; then \ - NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ - && awk '/^P:nginx$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ - fi && \ - apk add --no-cache --upgrade \ - memcached \ - nginx==${NGINX_VERSION} \ - nginx-mod-http-brotli==${NGINX_VERSION} \ - nginx-mod-http-dav-ext==${NGINX_VERSION} \ - nginx-mod-http-echo==${NGINX_VERSION} \ - nginx-mod-http-fancyindex==${NGINX_VERSION} \ - nginx-mod-http-geoip==${NGINX_VERSION} \ - nginx-mod-http-geoip2==${NGINX_VERSION} \ - nginx-mod-http-headers-more==${NGINX_VERSION} \ - nginx-mod-http-image-filter==${NGINX_VERSION} \ - nginx-mod-http-nchan==${NGINX_VERSION} \ - nginx-mod-http-perl==${NGINX_VERSION} \ - nginx-mod-http-redis2==${NGINX_VERSION} \ - nginx-mod-http-set-misc==${NGINX_VERSION} \ - nginx-mod-http-upload-progress==${NGINX_VERSION} \ - nginx-mod-http-xslt-filter==${NGINX_VERSION} \ - nginx-mod-mail==${NGINX_VERSION} \ - nginx-mod-rtmp==${NGINX_VERSION} \ - nginx-mod-stream==${NGINX_VERSION} \ - nginx-mod-stream-geoip==${NGINX_VERSION} \ - nginx-mod-stream-geoip2==${NGINX_VERSION} \ - nginx-vim==${NGINX_VERSION} \ - php7-bcmath \ - php7-bz2 \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-exif \ - php7-ftp \ - php7-gd \ - php7-gmp \ - php7-iconv \ - php7-imap \ - php7-intl \ - php7-ldap \ - php7-mcrypt \ - php7-memcached \ - php7-mysqli \ - php7-mysqlnd \ - php7-opcache \ - php7-pdo_mysql \ - php7-pdo_odbc \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-pear \ - php7-pecl-apcu \ - php7-pecl-mailparse \ - php7-pecl-redis \ - php7-pgsql \ - php7-phar \ - php7-posix \ - php7-soap \ - php7-sockets \ - php7-sodium \ - php7-sqlite3 \ - php7-tokenizer \ - php7-xml \ - php7-xmlreader \ - php7-xmlrpc \ - php7-xsl \ - php7-zip && \ - echo "**** configure nginx ****" && \ - rm -f /etc/nginx/http.d/default.conf && \ - sed -i \ - 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \ - /defaults/nginx.conf + apk add --no-cache --upgrade \ + curl && \ + if [ -z ${NGINX_VERSION+x} ]; then \ + NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:nginx$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ + fi && \ + apk add --no-cache --upgrade \ + memcached \ + nginx==${NGINX_VERSION} \ + nginx-mod-http-brotli==${NGINX_VERSION} \ + nginx-mod-http-dav-ext==${NGINX_VERSION} \ + nginx-mod-http-echo==${NGINX_VERSION} \ + nginx-mod-http-fancyindex==${NGINX_VERSION} \ + nginx-mod-http-geoip==${NGINX_VERSION} \ + nginx-mod-http-geoip2==${NGINX_VERSION} \ + nginx-mod-http-headers-more==${NGINX_VERSION} \ + nginx-mod-http-image-filter==${NGINX_VERSION} \ + nginx-mod-http-nchan==${NGINX_VERSION} \ + nginx-mod-http-perl==${NGINX_VERSION} \ + nginx-mod-http-redis2==${NGINX_VERSION} \ + nginx-mod-http-set-misc==${NGINX_VERSION} \ + nginx-mod-http-upload-progress==${NGINX_VERSION} \ + nginx-mod-http-xslt-filter==${NGINX_VERSION} \ + nginx-mod-mail==${NGINX_VERSION} \ + nginx-mod-rtmp==${NGINX_VERSION} \ + nginx-mod-stream==${NGINX_VERSION} \ + nginx-mod-stream-geoip==${NGINX_VERSION} \ + nginx-mod-stream-geoip2==${NGINX_VERSION} \ + nginx-vim==${NGINX_VERSION} \ + php7-bcmath \ + php7-bz2 \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-exif \ + php7-ftp \ + php7-gd \ + php7-gmp \ + php7-iconv \ + php7-imap \ + php7-intl \ + php7-ldap \ + php7-mcrypt \ + php7-memcached \ + php7-mysqli \ + php7-mysqlnd \ + php7-opcache \ + php7-pdo_mysql \ + php7-pdo_odbc \ + php7-pdo_pgsql \ + php7-pdo_sqlite \ + php7-pear \ + php7-pecl-apcu \ + php7-pecl-mailparse \ + php7-pecl-redis \ + php7-pgsql \ + php7-phar \ + php7-posix \ + php7-soap \ + php7-sockets \ + php7-sodium \ + php7-sqlite3 \ + php7-tokenizer \ + php7-xml \ + php7-xmlreader \ + php7-xmlrpc \ + php7-xsl \ + php7-zip && \ + echo "**** configure nginx ****" && \ + rm -f /etc/nginx/http.d/default.conf && \ + sed -i \ + 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \ + /defaults/nginx.conf # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6f245c3..511c91b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.13 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14 # set version label ARG BUILD_DATE @@ -12,79 +12,79 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 # install packages RUN \ - apk add --no-cache --upgrade \ - curl && \ - if [ -z ${NGINX_VERSION+x} ]; then \ - NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ - && awk '/^P:nginx$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ - fi && \ - apk add --no-cache --upgrade \ - memcached \ - nginx==${NGINX_VERSION} \ - nginx-mod-http-brotli==${NGINX_VERSION} \ - nginx-mod-http-dav-ext==${NGINX_VERSION} \ - nginx-mod-http-echo==${NGINX_VERSION} \ - nginx-mod-http-fancyindex==${NGINX_VERSION} \ - nginx-mod-http-geoip==${NGINX_VERSION} \ - nginx-mod-http-geoip2==${NGINX_VERSION} \ - nginx-mod-http-headers-more==${NGINX_VERSION} \ - nginx-mod-http-image-filter==${NGINX_VERSION} \ - nginx-mod-http-nchan==${NGINX_VERSION} \ - nginx-mod-http-perl==${NGINX_VERSION} \ - nginx-mod-http-redis2==${NGINX_VERSION} \ - nginx-mod-http-set-misc==${NGINX_VERSION} \ - nginx-mod-http-upload-progress==${NGINX_VERSION} \ - nginx-mod-http-xslt-filter==${NGINX_VERSION} \ - nginx-mod-mail==${NGINX_VERSION} \ - nginx-mod-rtmp==${NGINX_VERSION} \ - nginx-mod-stream==${NGINX_VERSION} \ - nginx-mod-stream-geoip==${NGINX_VERSION} \ - nginx-mod-stream-geoip2==${NGINX_VERSION} \ - nginx-vim==${NGINX_VERSION} \ - php7-bcmath \ - php7-bz2 \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-exif \ - php7-ftp \ - php7-gd \ - php7-gmp \ - php7-iconv \ - php7-imap \ - php7-intl \ - php7-ldap \ - php7-mcrypt \ - php7-memcached \ - php7-mysqli \ - php7-mysqlnd \ - php7-opcache \ - php7-pdo_mysql \ - php7-pdo_odbc \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-pear \ - php7-pecl-apcu \ - php7-pecl-mailparse \ - php7-pecl-redis \ - php7-pgsql \ - php7-phar \ - php7-posix \ - php7-soap \ - php7-sockets \ - php7-sodium \ - php7-sqlite3 \ - php7-tokenizer \ - php7-xml \ - php7-xmlreader \ - php7-xmlrpc \ - php7-xsl \ - php7-zip && \ - echo "**** configure nginx ****" && \ - rm -f /etc/nginx/http.d/default.conf && \ - sed -i \ - 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \ - /defaults/nginx.conf + apk add --no-cache --upgrade \ + curl && \ + if [ -z ${NGINX_VERSION+x} ]; then \ + NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:nginx$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ + fi && \ + apk add --no-cache --upgrade \ + memcached \ + nginx==${NGINX_VERSION} \ + nginx-mod-http-brotli==${NGINX_VERSION} \ + nginx-mod-http-dav-ext==${NGINX_VERSION} \ + nginx-mod-http-echo==${NGINX_VERSION} \ + nginx-mod-http-fancyindex==${NGINX_VERSION} \ + nginx-mod-http-geoip==${NGINX_VERSION} \ + nginx-mod-http-geoip2==${NGINX_VERSION} \ + nginx-mod-http-headers-more==${NGINX_VERSION} \ + nginx-mod-http-image-filter==${NGINX_VERSION} \ + nginx-mod-http-nchan==${NGINX_VERSION} \ + nginx-mod-http-perl==${NGINX_VERSION} \ + nginx-mod-http-redis2==${NGINX_VERSION} \ + nginx-mod-http-set-misc==${NGINX_VERSION} \ + nginx-mod-http-upload-progress==${NGINX_VERSION} \ + nginx-mod-http-xslt-filter==${NGINX_VERSION} \ + nginx-mod-mail==${NGINX_VERSION} \ + nginx-mod-rtmp==${NGINX_VERSION} \ + nginx-mod-stream==${NGINX_VERSION} \ + nginx-mod-stream-geoip==${NGINX_VERSION} \ + nginx-mod-stream-geoip2==${NGINX_VERSION} \ + nginx-vim==${NGINX_VERSION} \ + php7-bcmath \ + php7-bz2 \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-exif \ + php7-ftp \ + php7-gd \ + php7-gmp \ + php7-iconv \ + php7-imap \ + php7-intl \ + php7-ldap \ + php7-mcrypt \ + php7-memcached \ + php7-mysqli \ + php7-mysqlnd \ + php7-opcache \ + php7-pdo_mysql \ + php7-pdo_odbc \ + php7-pdo_pgsql \ + php7-pdo_sqlite \ + php7-pear \ + php7-pecl-apcu \ + php7-pecl-mailparse \ + php7-pecl-redis \ + php7-pgsql \ + php7-phar \ + php7-posix \ + php7-soap \ + php7-sockets \ + php7-sodium \ + php7-sqlite3 \ + php7-tokenizer \ + php7-xml \ + php7-xmlreader \ + php7-xmlrpc \ + php7-xsl \ + php7-zip && \ + echo "**** configure nginx ****" && \ + rm -f /etc/nginx/http.d/default.conf && \ + sed -i \ + 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \ + /defaults/nginx.conf # add local files COPY root/ / diff --git a/README.md b/README.md index a5d04e1..a0eb40b 100644 --- a/README.md +++ b/README.md @@ -227,6 +227,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **01.07.21:** - Rebasing to alpine 3.14. * **24.06.21:** - Update default nginx conf folder. * **12.04.21:** - Add php7-gmp and php7-pecl-mailparse. * **13.02.21:** - Remove php7-pecl-imagick (it now installs the full imagemagick with too much crud). Users can install it via [this docker mod](https://github.com/linuxserver/docker-mods/tree/swag-imagemagick). diff --git a/readme-vars.yml b/readme-vars.yml index acd0222..e879c42 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -40,6 +40,7 @@ app_setup_block: | # changelog changelogs: + - { date: "01.07.21:", desc: "Rebasing to alpine 3.14." } - { date: "24.06.21:", desc: "Update default nginx conf folder." } - { date: "12.04.21:", desc: "Add php7-gmp and php7-pecl-mailparse." } - { date: "13.02.21:", desc: "Remove php7-pecl-imagick (it now installs the full imagemagick with too much crud). Users can install it via [this docker mod](https://github.com/linuxserver/docker-mods/tree/swag-imagemagick)." } diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index 2a7ea15..a9f006b 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -2,22 +2,22 @@ # make our folders and links mkdir -p \ - /config/geoip2db + /config/geoip2db # remove lua bits from nginx.conf if not done before if ! grep -q '#Removed lua' /config/nginx/nginx.conf; then - echo "Removing lua specific info from nginx.conf" - sed -i 's|\tlua_load_resty_core off;|\t#Removed lua. Do not remove this comment|g' /config/nginx/nginx.conf + echo "Removing lua specific info from nginx.conf" + sed -i 's|\tlua_load_resty_core off;|\t#Removed lua. Do not remove this comment|g' /config/nginx/nginx.conf fi # create GeoIP2 folder symlink [[ -d /var/lib/libmaxminddb ]] && [[ ! -L /var/lib/libmaxminddb ]] && \ - rm -rf /var/lib/libmaxminddb + rm -rf /var/lib/libmaxminddb [[ ! -d /var/lib/libmaxminddb ]] && \ - ln -s /config/geoip2db /var/lib/libmaxminddb + ln -s /config/geoip2db /var/lib/libmaxminddb # check GeoIP2 database if [ -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then - echo "GeoIP2 database found" + echo "GeoIP2 database found" else - echo "Starting 2019/12/30, GeoIP2 databases require personal license key to download. Please manually download/update the GeoIP2 db and save as /config/geoip2db/GeoLite2-City.mmdb" + echo "Starting 2019/12/30, GeoIP2 databases require personal license key to download. Please manually download/update the GeoIP2 db and save as /config/geoip2db/GeoLite2-City.mmdb" fi \ No newline at end of file