Merge pull request #21 from kekru/feature/update-nginx

Update nginx to 1.20.2 (current stable version)
kekru · Dec 17, 2021 · 53a676e · 53a676e
2 parents 8482d4f + 5f3926f
commit 53a676e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
-# Original Dockerfile: https://github.com/nginxinc/docker-nginx/tree/5488180ebdd45b12b45107694dfa92dc878a2795/stable/alpine
-FROM nginx:1.18.0-alpine
+# Original Dockerfile: https://github.com/nginxinc/docker-nginx/blob/b0e153a1b644ca8b2bd378b14913fff316e07cf2/stable/alpine/Dockerfile
+FROM nginx:1.20.2-alpine
 LABEL MAINTAINER="Kevin Krummenauer <[email protected]>"
 RUN apk add --no-cache openssl
 

diff --git a/README.md b/README.md
@@ -115,3 +115,7 @@ Thanks [@smiller171](https://github.com/smiller171) for contributing!
 + add automatic tests
 
 Thanks [@benkorichard](https://github.com/benkorichard) for contributing!
+
+#### v0.4.0
+
++ update nginx version to 1.20.2
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,7 +12,7 @@ x-sharedDeployConfig: &sharedDeployConfig
           memory: 150M
         reservations:
           cpus: '0.1'
-          memory: 5M
+          memory: 10M
 
 version: "3.4"