fix: Remove mariadb-client and move to vim-tiny

Signed-off-by: Julius Knorr <jus@bitgrid.net>

Author: juliusknorr

docker/Dockerfile.php.template

@@ -34,7 +34,7 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
 RUN apt update && apt-get install -y --no-install-recommends \
     git \
     curl \
-    vim \
+    vim-tiny \
     nano \
     sudo \
     cron \
@@ -47,7 +47,6 @@ RUN apt update && apt-get install -y --no-install-recommends \
     jq \
     ripgrep \
     rsync \
-    mariadb-client \
     blackfire \
     && rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile.php71

@@ -34,7 +34,7 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
 RUN apt update && apt-get install -y --no-install-recommends \
     git \
     curl \
-    vim \
+    vim-tiny \
     nano \
     sudo \
     cron \
@@ -47,7 +47,6 @@ RUN apt update && apt-get install -y --no-install-recommends \
     jq \
     ripgrep \
     rsync \
-    mariadb-client \
     blackfire \
     && rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile.php72

@@ -34,7 +34,7 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
 RUN apt update && apt-get install -y --no-install-recommends \
     git \
     curl \
-    vim \
+    vim-tiny \
     nano \
     sudo \
     cron \
@@ -47,7 +47,6 @@ RUN apt update && apt-get install -y --no-install-recommends \
     jq \
     ripgrep \
     rsync \
-    mariadb-client \
     blackfire \
     && rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile.php73

@@ -34,7 +34,7 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
 RUN apt update && apt-get install -y --no-install-recommends \
     git \
     curl \
-    vim \
+    vim-tiny \
     nano \
     sudo \
     cron \
@@ -47,7 +47,6 @@ RUN apt update && apt-get install -y --no-install-recommends \
     jq \
     ripgrep \
     rsync \
-    mariadb-client \
     blackfire \
     && rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile.php74

@@ -34,7 +34,7 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
 RUN apt update && apt-get install -y --no-install-recommends \
     git \
     curl \
-    vim \
+    vim-tiny \
     nano \
     sudo \
     cron \
@@ -47,7 +47,6 @@ RUN apt update && apt-get install -y --no-install-recommends \
     jq \
     ripgrep \
     rsync \
-    mariadb-client \
     blackfire \
     && rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile.php80

@@ -34,7 +34,7 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
 RUN apt update && apt-get install -y --no-install-recommends \
     git \
     curl \
-    vim \
+    vim-tiny \
     nano \
     sudo \
     cron \
@@ -47,7 +47,6 @@ RUN apt update && apt-get install -y --no-install-recommends \
     jq \
     ripgrep \
     rsync \
-    mariadb-client \
     blackfire \
     && rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile.php81

@@ -34,7 +34,7 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
 RUN apt update && apt-get install -y --no-install-recommends \
     git \
     curl \
-    vim \
+    vim-tiny \
     nano \
     sudo \
     cron \
@@ -47,7 +47,6 @@ RUN apt update && apt-get install -y --no-install-recommends \
     jq \
     ripgrep \
     rsync \
-    mariadb-client \
     blackfire \
     && rm -rf /var/lib/apt/lists/*
 

docker/nginx/my_proxy.conf

@@ -5,7 +5,11 @@ proxy_read_timeout 3600;
 proxy_send_timeout 3600;
 proxy_connect_timeout 3600;
 
-proxy_set_header X-Forwarded-Proto $scheme;
+#proxy_http_version 1.1;
+#proxy_set_header Upgrade $http_upgrade;
+#proxy_set_header Connection "Upgrade";
+
+proxy_set_header X-Forwarded-Proto https;
 # FIXME: remove this when onlyoffice is fixed https to http proxying
 # https://github.com/ONLYOFFICE/DocumentServer/issues/2186
-proxy_set_header CloudFront-Forwarded-Proto $scheme;
+proxy_set_header CloudFront-Forwarded-Proto $scheme;

docker/php82/Dockerfile

@@ -34,7 +34,7 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
 RUN apt update && apt-get install -y --no-install-recommends \
     git \
     curl \
-    vim \
+    vim-tiny \
     nano \
     sudo \
     cron \
@@ -47,7 +47,6 @@ RUN apt update && apt-get install -y --no-install-recommends \
     jq \
     ripgrep \
     rsync \
-    mariadb-client \
     blackfire \
     && rm -rf /var/lib/apt/lists/*
 

docker/php83/Dockerfile

@@ -34,7 +34,7 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
 RUN apt update && apt-get install -y --no-install-recommends \
     git \
     curl \
-    vim \
+    vim-tiny \
     nano \
     sudo \
     cron \
@@ -47,7 +47,6 @@ RUN apt update && apt-get install -y --no-install-recommends \
     jq \
     ripgrep \
     rsync \
-    mariadb-client \
     blackfire \
     && rm -rf /var/lib/apt/lists/*