Merge pull request #22 from linuxserver/nginx

upgrade baseimage packages during build
2026-04-13 05:51:38 +09:00 · 2018-11-20 17:57:01 +00:00 · 2018-11-20 12:21:17 -05:00 · 2018-11-10 18:26:59 +00:00 · 2018-11-06 15:23:50 +00:00 · 2018-11-05 10:10:41 -05:00
6 changed files with 20 additions and 10 deletions
--- a/5
+++ b/5
@@ -12,8 +12,9 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2

 RUN \
 echo "**** install runtime packages ****" && \
- apk add --no-cache \
+ apk add --no-cache --upgrade \
 	curl \
+	nginx \
 	php7-ctype \
 	php7-pdo_sqlite \
 	php7-tokenizer \
@@ -23,7 +24,7 @@ RUN \
 mkdir -p \
 	/var/www/localhost/heimdall && \
 if [ -z ${HEIMDALL_RELEASE+x} ]; then \
- 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
+	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
 	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
 fi && \
 curl -o \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -15,17 +15,19 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2

 RUN \
 echo "**** install runtime packages ****" && \
- apk add --no-cache \
+ apk add --no-cache --upgrade \
 	curl \
+	nginx \
 	php7-ctype \
 	php7-pdo_sqlite \
 	php7-tokenizer \
+	php7-zip \
 	tar && \
 echo "**** install heimdall ****" && \
 mkdir -p \
 	/var/www/localhost/heimdall && \
 if [ -z ${HEIMDALL_RELEASE+x} ]; then \
- 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
+	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
 	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
 fi && \
 curl -o \
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -15,17 +15,19 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2

 RUN \
 echo "**** install runtime packages ****" && \
- apk add --no-cache \
+ apk add --no-cache --upgrade \
 	curl \
+	nginx \
 	php7-ctype \
 	php7-pdo_sqlite \
 	php7-tokenizer \
+	php7-zip \
 	tar && \
 echo "**** install heimdall ****" && \
 mkdir -p \
 	/var/www/localhost/heimdall && \
 if [ -z ${HEIMDALL_RELEASE+x} ]; then \
- 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
+	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
 	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
 fi && \
 curl -o \
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -32,7 +32,7 @@ apr-util apr-util-1.6.1-r2
 apache2-utils apache2-utils-2.4.35-r0
 nghttp2-libs nghttp2-libs-1.32.0-r0
 libssh2 libssh2-1.8.0-r3
-libcurl libcurl-7.61.1-r0
+libcurl libcurl-7.61.1-r1
 pcre2 pcre2-10.31-r0
 git git-2.18.1-r0
 popt popt-1.16-r7
@@ -40,7 +40,7 @@ logrotate logrotate-3.14.0-r0
 libmagic libmagic-5.32-r0
 nano nano-2.9.8-r0
 pcre pcre-8.42-r0
-nginx nginx-1.14.0-r1
+nginx nginx-1.14.1-r0
 libcrypto1.0 libcrypto1.0-1.0.2p-r0
 libssl1.0 libssl1.0-1.0.2p-r0
 openssl openssl-1.0.2p-r0
@@ -57,10 +57,12 @@ php7-session php7-session-7.2.10-r0
 php7-simplexml php7-simplexml-7.2.10-r0
 php7-xml php7-xml-7.2.10-r0
 php7-xmlwriter php7-xmlwriter-7.2.10-r0
-curl curl-7.61.1-r0
+curl curl-7.61.1-r1
 php7-ctype php7-ctype-7.2.10-r0
 php7-pdo php7-pdo-7.2.10-r0
 sqlite-libs sqlite-libs-3.24.0-r0
 php7-pdo_sqlite php7-pdo_sqlite-7.2.10-r0
 php7-tokenizer php7-tokenizer-7.2.10-r0
+libzip libzip-1.5.1-r1
+php7-zip php7-zip-7.2.10-r0
 tar tar-1.30-r0
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -47,6 +47,8 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." }
+  - { date: "04.11.18:", desc: "Add php7-zip." }
  - { date: "31.10.18:", desc: "Add queue service." }
  - { date: "17.10.18:", desc: "Symlink avatars folder." }
  - { date: "16.10.18:", desc: "Updated fastcgi_params for user login support." }
--- a/root/etc/cont-init.d/50-config
+++ b/root/etc/cont-init.d/50-config
@@ -2,7 +2,7 @@

 # make our folders
 mkdir -p \
-	/config/www/{backgrounds,icons,avatars}
+	/config/www/{backgrounds,icons,avatars,SupportedApps}

 # copy .env if not exists
 [[ ! -f /config/www/.env ]] && \
@@ -16,6 +16,7 @@ symlinks=( \
 /var/www/localhost/heimdall/storage/app/public/avatars \
 /var/www/localhost/heimdall/storage/app/public/backgrounds \
 /var/www/localhost/heimdall/storage/app/public/icons \
+/var/www/localhost/heimdall/app/SupportedApps \
 /var/www/localhost/heimdall/database/app.sqlite \
 /var/www/localhost/heimdall/.env )
Author	SHA1	Message	Date
Homer	7dba595954	Merge pull request #22 from linuxserver/nginx upgrade baseimage packages during build	2018-11-20 17:57:01 +00:00
aptalca	a87dcde2cd	upgrade baseimage packages during build	2018-11-20 12:21:17 -05:00
LinuxServer-CI	082195f95e	Bot Updating Package Versions	2018-11-10 18:26:59 +00:00
LinuxServer-CI	d7f12610c6	Bot Updating Package Versions	2018-11-06 15:23:50 +00:00
aptalca	d733b73d4c	Merge pull request #21 from KodeStar/master Update 50-config	2018-11-05 10:10:41 -05:00
KodeStar	c707b2d071	Update 50-config	2018-11-05 15:01:46 +00:00
aptalca	cdb341b0e0	Merge pull request #20 from KodeStar/master Add missing folder to mkdir	2018-11-05 09:16:14 -05:00
KodeStar	965642e618	Add missing folder to mkdir	2018-11-05 14:05:26 +00:00
j0nnymoe	c379a17320	Merge pull request #19 from KodeStar/patch-2 Symlink SupportedApps to the config folder	2018-11-05 12:34:37 +00:00
KodeStar	a39112cc00	Symlink SupportedApps to the config folder	2018-11-05 12:14:21 +00:00
saarg	f9f40751fb	Merge pull request #18 from linuxserver/zip Add php7-zip	2018-11-05 07:37:20 +01:00
aptalca	c339f6a055	fix formatting	2018-11-04 22:07:01 -05:00
aptalca	8c52faae78	add php7-zip	2018-11-04 18:26:08 -05:00
LinuxServer-CI	9e78392b5f	Bot Updating Package Versions	2018-11-04 22:02:57 +00:00