From 80f31abee8f9d4c5027abe5271eca2cfa35f8f5e Mon Sep 17 00:00:00 2001
From: Julien Bouquillon <julien.bouquillon@sg.social.gouv.fr>
Date: Thu, 16 Jun 2022 21:52:49 +0200
Subject: [PATCH] fix: upgrade nginx (#355)

* Update Dockerfile

* Update and rename .kube-workflow/common/values.yaml to .kube-workflow/values.yaml

* Rename .kube-workflow/env/prod/templates/redirect.yaml to .kube-workflow/prod/templates/redirect.yaml
---
 .kube-workflow/{env => }/prod/templates/redirect.yaml | 0
 .kube-workflow/{common => }/values.yaml               | 2 +-
 Dockerfile                                            | 6 +-----
 3 files changed, 2 insertions(+), 6 deletions(-)
 rename .kube-workflow/{env => }/prod/templates/redirect.yaml (100%)
 rename .kube-workflow/{common => }/values.yaml (97%)

diff --git a/.kube-workflow/env/prod/templates/redirect.yaml b/.kube-workflow/prod/templates/redirect.yaml
similarity index 100%
rename from .kube-workflow/env/prod/templates/redirect.yaml
rename to .kube-workflow/prod/templates/redirect.yaml
diff --git a/.kube-workflow/common/values.yaml b/.kube-workflow/values.yaml
similarity index 97%
rename from .kube-workflow/common/values.yaml
rename to .kube-workflow/values.yaml
index 9494b67c..d43d08cb 100644
--- a/.kube-workflow/common/values.yaml
+++ b/.kube-workflow/values.yaml
@@ -1,6 +1,6 @@
 app:
   enabled: true
-  containerPort: 3000
+  containerPort: 8080
   ingress:
     annotations:
       nginx.ingress.kubernetes.io/configuration-snippet: |
diff --git a/Dockerfile b/Dockerfile
index a540586d..7d996ca1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,10 +6,6 @@ RUN yarn --production --frozen-lockfile --prefer-offline && yarn cache clean
 RUN yarn build
 RUN yarn export
 
-FROM ghcr.io/socialgouv/docker/nginx:6.65.0
-
-USER 101
-
-ENV PORT=3000
+FROM ghcr.io/socialgouv/docker/nginx:7.0.1
 
 COPY --from=builder --chown=nginx:nginx /out /usr/share/nginx/html