Merge pull request #34 from linuxserver/upgrade

Attempt to upgrade packages during build
linuxserver · Nov 19, 2018 · 43f957a · 43f957a
2 parents 510227f + 971ed76
commit 43f957a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,9 +11,10 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 # install packages
 RUN \
- apk add --no-cache \
+ apk add --no-cache --upgrade \
 	curl \
 	memcached \
+	nginx \
 	nginx-mod-http-echo \
 	nginx-mod-http-fancyindex \
 	nginx-mod-http-geoip \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -14,9 +14,10 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 # install packages
 RUN \
- apk add --no-cache \
+ apk add --no-cache --upgrade \
 	curl \
 	memcached \
+	nginx \
 	nginx-mod-http-echo \
 	nginx-mod-http-fancyindex \
 	nginx-mod-http-geoip \

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -14,9 +14,10 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 # install packages
 RUN \
- apk add --no-cache \
+ apk add --no-cache --upgrade \
 	curl \
 	memcached \
+	nginx \
 	nginx-mod-http-echo \
 	nginx-mod-http-fancyindex \
 	nginx-mod-http-geoip \

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -40,6 +40,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "18.11.18:", desc: "Attempt to upgrade packages during build." }
   - { date: "28.09.18:", desc: "Multi-arch image." }
   - { date: "17.08.18:", desc: "Rebase to alpine 3.8, inherit nginx.conf from nginx baseimage." }
   - { date: "11.05.18:", desc: "Add php pgsql support." }