From b348a882f4919d00379ba20b21b1646b538cebe7 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 28 Feb 2022 17:16:27 +0100
Subject: [PATCH] :tada: Add minio client to devenv

And minor fix the nginx config.
---
 docker/devenv/Dockerfile       |  8 ++++++++
 docker/devenv/files/nginx.conf | 10 ++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index a49486e1eb..a13f404b46 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -158,6 +158,14 @@ RUN set -ex; \
     tar -xf /tmp/babashka.tar.gz; \
     rm -rf /tmp/babashka.tar.gz;
 
+RUN set -ex; \
+    curl -LfsSo /usr/bin/local/mc https://dl.min.io/client/mc/release/linux-amd64/mc; \
+    chmod +x /usr/bin/local/mc; \
+    /usr/bin/local/mc alias set penpot-s3/ http://minio:9000 minioadmin minioadmin; \
+    /usr/bin/local/mc admin user add penpot-s3 penpot-devenv penpot-devenv; \
+    /usr/bin/local/mc admin policy set penpot-s3 readwrite user=penpot-devenv; \
+    /usr/bin/local/mc mb penpot-s3/penpot -p;
+
 WORKDIR /home
 
 EXPOSE 3447
diff --git a/docker/devenv/files/nginx.conf b/docker/devenv/files/nginx.conf
index 147c51eeab..0560dc0b04 100644
--- a/docker/devenv/files/nginx.conf
+++ b/docker/devenv/files/nginx.conf
@@ -56,7 +56,7 @@ http {
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-        resolver 8.8.8.8;
+        resolver 127.0.0.11;
 
         etag off;
 
@@ -67,8 +67,6 @@ http {
             set $redirect_host "$upstream_http_x_host";
             set $redirect_cache_control "$upstream_http_cache_control";
 
-            proxy_buffering off;
-
             proxy_set_header Host "$redirect_host";
             proxy_hide_header etag;
             proxy_hide_header x-amz-id-2;
@@ -77,9 +75,9 @@ http {
             proxy_hide_header x-amz-server-side-encryption;
             proxy_pass $redirect_uri;
 
-            add_header x-internal-redirect "$redirect_uri";
-            add_header x-cache-control "$redirect_cache_control";
-            add_header cache-control "$redirect_cache_control";
+            #add_header x-internal-redirect "$redirect_uri";
+            #add_header x-cache-control "$redirect_cache_control";
+            #add_header cache-control "$redirect_cache_control";
         }
 
         location /assets {