From 852e5f3e0245fc95075611c678204b4f6e70f065 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Mon, 10 Oct 2022 20:34:35 +0300
Subject: [PATCH] versions

---
 .deploy-infra/deploy-dev.yaml  | 44 ----------------------------------
 .deploy-infra/deploy-prod.yaml | 10 ++++----
 .gitlab-ci.yml                 |  2 --
 3 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/.deploy-infra/deploy-dev.yaml b/.deploy-infra/deploy-dev.yaml
index 21f1a2b..6b56662 100644
--- a/.deploy-infra/deploy-dev.yaml
+++ b/.deploy-infra/deploy-dev.yaml
@@ -145,50 +145,6 @@ services:
         parallelism: 1
         order: start-first
 
-  memcached:
-    image: memcached:alpine3.16
-    ports:
-      - "11211:11211"
-    deploy:
-      resources:
-        limits:
-          memory: 64M
-      mode: replicated
-      placement:
-        constraints: [node.role == manager]
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
-  sentry:
-    image: sentry:9.1.2
-    volumes:
-      - /sprint-data/sentry:/var/lib/sentry/files
-    environment:
-      SENTRY_SECRET_KEY: $SENTRY_SECRET_KEY_DEV
-      SENTRY_POSTGRES_HOST: pg.develop.sprinthub.ru
-      SENTRY_POSTGRES_PORT: 5432
-      SENTRY_DB_NAME: sentry
-      SENTRY_DB_USER: postgres
-      SENTRY_DB_PASSWORD: $DB_PASSWORD_DEV
-      SENTRY_REDIS_HOST: redis.develop.sprinthub.ru
-      SENTRY_REDIS_PORT: 6379
-      SENTRY_REDIS_DB: sentry
-      SENTRY_FILESTORE_DIR: /var/lib/sentry/files
-      SENTRY_MEMCACHED_HOST: memcached.develop.sprinthub.ru
-      SENTRY_MEMCACHED_PORT: 11211
-    deploy:
-      mode: replicated
-      placement:
-        constraints: [node.role == manager]
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
 volumes:
   minio_data:
     driver: local
diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml
index c7fad14..f5cc3cf 100644
--- a/.deploy-infra/deploy-prod.yaml
+++ b/.deploy-infra/deploy-prod.yaml
@@ -25,7 +25,7 @@ services:
         order: start-first
 
   postgres:
-    image: postgres
+    image: postgres:14-alpine
     volumes:
       - /sprint-data/postgres-data:/var/lib/postgresql/data
     environment:
@@ -43,7 +43,7 @@ services:
         order: start-first
 
   mongo:
-    image: mongo
+    image: mongo:6.0.2
     volumes:
       - /sprint-data/mongo:/data/db
     environment:
@@ -79,7 +79,7 @@ services:
         order: start-first
 
   redis:
-    image: redis
+    image: redis:alpine3.16
     ports:
       - "6379:6379"
     command: redis-server --requirepass $REDIS_PASSWORD_PROD
@@ -110,7 +110,7 @@ services:
         order: start-first
 
   minio:
-    image: bitnami/minio
+    image: bitnami/minio:2022.10.8
     volumes:
       - minio_data:/data
     environment:
@@ -130,7 +130,7 @@ services:
         order: start-first
   
   grafana:
-    image: grafana/grafana
+    image: grafana/grafana:9.1.7-ubuntu
     volumes:
       - /sprint-data/grafana:/var/lib/grafana
     ports:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1190e9e..5e7da1d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,6 @@ stages:
     - mkdir /sprint-data/mongo || true
     - mkdir /sprint-data/grafana || true
     - chmod 777 /sprint-data/grafana
-    - mkdir /sprint-data/sentry || true
-    - chmod 777 /sprint-data/sentry
 
 build:
   stage: build