rabbit

.deploy-infra/deploy-dev.yaml

@@ -129,18 +129,6 @@ services:
         parallelism: 1
         order: start-first
 
-  docker-cleaner:
-    image: mathwave/sprint-repo:sprint-infra-docker-cleaner
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    deploy:
-      mode: global
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: stop-first
-
 volumes:
   minio_data:
     driver: local

.deploy-infra/deploy-prod.yaml

@@ -129,18 +129,6 @@ services:
         parallelism: 1
         order: start-first
 
-  docker-cleaner:
-    image: mathwave/sprint-repo:sprint-infra-docker-cleaner
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    deploy:
-      mode: global
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: stop-first
-
 volumes:
   minio_data:
     driver: local

.gitlab-ci.yml

@@ -24,8 +24,6 @@ build:
     - docker push mathwave/sprint-repo:sprint-infra-nginx-dev
     - docker build -t mathwave/sprint-repo:sprint-infra-nginx-prod nginx/nginx-prod
     - docker push mathwave/sprint-repo:sprint-infra-nginx-prod
-    - docker build -t mathwave/sprint-repo:sprint-infra-docker-cleaner docker-cleaner
-    - docker push mathwave/sprint-repo:sprint-infra-docker-cleaner
 
 deploy-dev:
   stage: deploy-dev

docker-cleaner/Dockerfile

@@ -1,7 +0,0 @@
-FROM docker:dind
-
-RUN mkdir /app
-WORKDIR /app
-COPY clean.sh clean.sh
-RUN chmod 777 clean.sh
-CMD ["./clean.sh"]

docker-cleaner/clean.sh

@@ -1,5 +0,0 @@
-while true
-do
-  docker image rm $(docker image ls -q) || true
-  sleep 86400
-done

nginx/nginx-prod/nginx-prod.conf

@@ -88,6 +88,25 @@ http {
         }
     }
 
+    server {
+        listen      443 ssl http2;
+        listen      [::]:443 ssl http2;
+        server_name rabbitmq.sprinthub.ru;
+
+        ssl_certificate     /etc/nginx/fullchain.pem;
+        ssl_certificate_key /etc/nginx/privkey.pem;
+
+        add_header X-Frame-Options "SAMEORIGIN" always;
+        add_header X-XSS-Protection "1; mode=block" always;
+        add_header X-Content-Type-Options "nosniff" always;
+        add_header Referrer-Policy "no-refferer-when-downgrade" always;
+        add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
+
+        location / {
+            proxy_pass http://dev.sprinthub.ru:15672/;
+        }
+    }
+
     server {
         listen      443 ssl http2;
         listen      [::]:443 ssl http2;