ci: use Docker DinD version from variable

fix: hide proxy headers for CORS

See merge request unboundsoftware/nginx-s3-upload!6

.gitlab-ci.yml

@@ -5,12 +5,12 @@ stages:
 variables:
   DOCKER_HOST: tcp://docker:2375/
 
-image: buildtool/build-tools:0.0.23
+image: buildtool/build-tools:${BUILDTOOLS_VERSION}
 
 build:
   stage: build
   services:
-    - docker:19.03-dind
+    - docker:${DOCKER_DIND_VERSION}
   script:
   - build
   - push

k8s/deploy.yaml

@@ -72,24 +72,30 @@ spec:
     targetPort: 80
   selector:
     app: nginx-s3-upload
-  type: ClusterIP
+  type: NodePort
 
 ---
 
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: nginx-s3-upload
   annotations:
-    kubernetes.io/ingress.class: "nginx"
+    kubernetes.io/ingress.class: "alb"
-    nginx.ingress.kubernetes.io/enable-cors: "true"
+    alb.ingress.kubernetes.io/group.name: "unbound"
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    alb.ingress.kubernetes.io/scheme: internet-facing
+    alb.ingress.kubernetes.io/target-type: instance
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80},{"HTTPS": 443}]'
+    alb.ingress.kubernetes.io/ssl-redirect: "443"
 spec:
   rules:
   - host: 'upload.unbound.se'
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: nginx-s3-upload
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: nginx-s3-upload
+            port:
+              number: 80

nginx.conf

@@ -86,11 +86,22 @@ http {
       proxy_set_header Authorization $authorization;
       proxy_hide_header x-amz-id-2;
       proxy_hide_header x-amz-request-id;
+      proxy_hide_header 'Access-Control-Expose-Headers';
+      proxy_hide_header 'Access-Control-Allow-Origin';
+      proxy_hide_header 'Access-Control-Allow-Credentials';
+      proxy_hide_header 'Access-Control-Allow-Methods';
+      proxy_hide_header 'Access-Control-Allow-Headers';
+      proxy_hide_header 'Access-Control-Max-Age';
       add_header X-File-URL $returnurl;
 
       resolver 8.8.8.8 valid=300s;
       resolver_timeout 10s;
       add_header 'Access-Control-Expose-Headers' 'X-File-Url';
+      add_header 'Access-Control-Allow-Origin' "*" ;
+      add_header 'Access-Control-Allow-Credentials' 'true' ;
+      add_header 'Access-Control-Allow-Methods' 'GET, PUT, OPTIONS' ;
+      add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Requested-With';
+      add_header 'Access-Control-Max-Age' 1728000;
 
       proxy_pass $url;
     }
@@ -148,11 +159,22 @@ http {
       proxy_set_header Authorization $authorization;
       proxy_hide_header x-amz-id-2;
       proxy_hide_header x-amz-request-id;
+      proxy_hide_header 'Access-Control-Expose-Headers';
+      proxy_hide_header 'Access-Control-Allow-Origin';
+      proxy_hide_header 'Access-Control-Allow-Credentials';
+      proxy_hide_header 'Access-Control-Allow-Methods';
+      proxy_hide_header 'Access-Control-Allow-Headers';
+      proxy_hide_header 'Access-Control-Max-Age';
       add_header X-File-URL $returnurl;
 
       resolver 8.8.8.8 valid=300s;
       resolver_timeout 10s;
       add_header 'Access-Control-Expose-Headers' 'X-File-Url';
+      add_header 'Access-Control-Allow-Origin' "*" ;
+      add_header 'Access-Control-Allow-Credentials' 'true' ;
+      add_header 'Access-Control-Allow-Methods' 'GET, PUT, OPTIONS' ;
+      add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Requested-With';
+      add_header 'Access-Control-Max-Age' 1728000;
 
       proxy_pass $url;
     }