Merge branch 'master' into normalization

.github/workflows/ci-cd.yml

@@ -11,13 +11,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.3.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2.5.0
 
       - name: Cache Docker layers
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v3.3.0
         with:
           path: /tmp/.buildx-cache
           key: docker-buildx-${{ matrix.version }}-${{ github.sha }}
@@ -36,12 +36,12 @@ jobs:
         run: docker run kooldev/nginx:${{ matrix.version }} nginx -v
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
-        if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/nginx'
+        uses: docker/login-action@v2.1.0
+        if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-nginx'
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Push to DockerHub
-        if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/nginx'
+        if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-nginx'
         run: docker push kooldev/nginx:${{ matrix.version }}

.github/workflows/docker-description.yml

@@ -12,10 +12,10 @@ jobs:
   docker-description:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.3.0
 
       - name: Sync Docker Hub Description
-        uses: peter-evans/dockerhub-description@v2
+        uses: peter-evans/dockerhub-description@v3.3.0
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

php/default.tmpl

@@ -15,7 +15,6 @@ server {
         try_files $uri $uri/ /{{ .Env.INDEX }}?$query_string;
 
         add_header X-Served-By kool.dev;
-
     }
 
     location ~ \.php$ {

static/default.tmpl

@@ -16,13 +16,6 @@ server {
         try_files $uri $uri/ /{{ .Env.INDEX }};
 
         add_header X-Served-By kool.dev;
-
-        # optimizations from https://docs.nginx.com/nginx/admin-guide/web-server/serving-static-content/
-        sendfile on;
-        sendfile_max_chunk 2m;
-        tcp_nopush on;
-        tcp_nodelay on;
-        keepalive_timeout 150;
     }
 
 

template/default_tmpl.blade.php

@@ -29,15 +29,6 @@
         try_files $uri $uri/ /@{{ .Env.INDEX }}{{ $version === 'php' ? '?$query_string' : '' }};
 
         add_header X-Served-By kool.dev;
-
-@if ($version === 'static')
-        # optimizations from https://docs.nginx.com/nginx/admin-guide/web-server/serving-static-content/
-        sendfile on;
-        sendfile_max_chunk 2m;
-        tcp_nopush on;
-        tcp_nodelay on;
-        keepalive_timeout 150;
-@endif
     }
 @endif