Update README.md

.gitignore

@@ -5,4 +5,4 @@ data/gitlab-test/postgresql
 data/gitlab-test/redis
 data/gitlab-test/gitlab-runner*
 
-Addons/gpg*
+Addons/

Addons/cleaner/.env.axample

@@ -1,7 +0,0 @@
-CLEAN_PERIOD=1800
-DELAY_TIME=86400
-KEEP_IMAGES=hub.bildme.ru/*
-KEEP_CONTAINERS=
-KEEP_CONTAINERS_NAMED=traefik*
-LOOP=true
-DEBUG=1

Addons/cleaner/docker-compose.yaml

@@ -1,16 +0,0 @@
-version: '3'
-services:
-  cleanup:
-    image: meltwater/docker-cleanup
-    restart: always
-    volumes:
-      - /var/lib/docker:/var/lib/docker:rw
-      - /var/run/docker.sock:/var/run/docker.sock:rw
-    environment:
-      - CLEAN_PERIOD=${CLEAN_PERIOD}
-      - DELAY_TIME=${DELAY_TIME}
-      - KEEP_IMAGES=${KEEP_IMAGES}
-      - KEEP_CONTAINERS=${KEEP_CONTAINERS}
-      - KEEP_CONTAINERS_NAMED=${KEEP_CONTAINERS_NAMED}
-      - LOOP=${LOOP}
-      - DEBUG=${DEBUG}

Addons/minio-srotage/storage-policy.json

@@ -1,14 +0,0 @@
-{
-	"Version": "2012-10-17",
-	"Statement": [
-		{
-			"Effect": "Allow",
-			"Action": [
-				"s3:*"
-			],
-			"Resource": [
-				"arn:aws:s3:::gitlab-storage/*"
-			]
-		}
-	]
-}

README.md

@@ -1,8 +1,8 @@
 # Репа по курсу Gitlab-CI: только практика
 
-1. Курс размещен [тут](https://lk.realmanual.ru/student/courses/25)
+1. Курс размещен [тут](https://realmanual.ru/public/course/570b3728-c242-4bcc-9502-4f8a81201ba7)
-2. Более подробно о курсе [тут](https://realmanual.ru/gitlab)
+2. Более подробно о курсе [тут](https://promo.realmanual.ru/gitlab)
-3. Миттап про установку [тут](https://lk.realmanual.ru/student/courses/22)
+3. Миттап про установку [тут](https://realmanual.ru/public/course/abfbffe1-a6a8-4c7e-b87c-36acd589aed0)
 4. Наша группа ТГ для вопросов [тут](https://t.me/realmanual_group)
 
 # Твики

docker-compose.yml

@@ -128,14 +128,14 @@ services:
       - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
       - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry.crt
       - REGISTRY_STORAGE_DELETE_ENABLED=true
-      # - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry
+      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry
-      - REGISTRY_STORAGE=s3
+      # - REGISTRY_STORAGE=s3
-      - REGISTRY_STORAGE_S3_ACCESSKEY
+      # - REGISTRY_STORAGE_S3_ACCESSKEY
-      - REGISTRY_STORAGE_S3_SECRETKEY
+      # - REGISTRY_STORAGE_S3_SECRETKEY
-      - REGISTRY_STORAGE_S3_REGIONENDPOINT
+      # - REGISTRY_STORAGE_S3_REGIONENDPOINT
-      - REGISTRY_STORAGE_S3_REGION
+      # - REGISTRY_STORAGE_S3_REGION
-      - REGISTRY_STORAGE_S3_BUCKET
+      # - REGISTRY_STORAGE_S3_BUCKET
-      - REGISTRY_STORAGE_CACHE_BLOBDESCRIPTOR=inmemory
+      # - REGISTRY_STORAGE_CACHE_BLOBDESCRIPTOR=inmemory
     expose:
       - 5000
     networks:
@@ -172,69 +172,47 @@ services:
     volumes:
       - ${SERVICE_DATA}/${SERVICE_NAME}/redis:/var/lib/redis:Z
 
-  runner_1: &runner
+  # runner_1: &runner
-    image: ${DOCKER_IMAGE_RUNNER}
+  #   image: ${DOCKER_IMAGE_RUNNER}
-    container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_1
+  #   container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_1
-    restart: always
+  #   restart: always
-    depends_on:
+  #   depends_on:
-      - gitlab
+  #     - gitlab
-    command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
+  #   command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
-    environment:
+  #   environment:
-      - CI_SERVER_URL=https://${GITLAB_HOST}
+  #     - CI_SERVER_URL=https://${GITLAB_HOST}
-      - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
+  #     - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
-      - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
+  #     - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
-      - RUNNER_TOKEN=${RUNNER_TOKEN}
+  #     - RUNNER_TOKEN=${RUNNER_TOKEN}
-      - RUNNER_DESCRIPTION=gitab-runner_1
+  #     - RUNNER_DESCRIPTION=gitab-runner_1
-      - RUNNER_EXECUTOR=docker
+  #     - RUNNER_EXECUTOR=docker
-      - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
+  #     - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-    networks:
+  #   networks:
-      - ${SERVICE_NETWORK}
+  #     - ${SERVICE_NETWORK}
-    volumes:
+  #   volumes:
-      - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_1:/etc/gitlab-runner
+  #     - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_1:/etc/gitlab-runner
-      - /var/run/docker.sock:/var/run/docker.sock
+  #     - /var/run/docker.sock:/var/run/docker.sock
 
-  runner_2:
+  # runner_2:
-    <<: *runner
+  #   <<: *runner
-    container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_2
+  #   container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_2
-    command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
+  #   environment:
-    environment:
+  #     - RUNNER_DESCRIPTION=gitab-runner_2
-      - CI_SERVER_URL=https://${GITLAB_HOST}
+  #   volumes:
-      - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
+  #     - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_2:/etc/gitlab-runner
-      - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
-      - RUNNER_TOKEN=${RUNNER_TOKEN}
-      - RUNNER_DESCRIPTION=gitab-runner_2
-      - RUNNER_EXECUTOR=docker
-      - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-    volumes:
-      - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_2:/etc/gitlab-runner
-      - /var/run/docker.sock:/var/run/docker.sock
 
-  runner_3:
+  # runner_3:
-    <<: *runner
+  #   <<: *runner
-    container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_3
+  #   container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_3
-    environment:
+  #   environment:
-      - CI_SERVER_URL=https://${GITLAB_HOST}
+  #     - RUNNER_DESCRIPTION=gitab-runner_3
-      - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
+  #   volumes:
-      - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
+  #     - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_3:/etc/gitlab-runner
-      - RUNNER_TOKEN=${RUNNER_TOKEN}
-      - RUNNER_DESCRIPTION=gitab-runner_3
-      - RUNNER_EXECUTOR=docker
-      - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-    volumes:
-      - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_3:/etc/gitlab-runner
-      - /var/run/docker.sock:/var/run/docker.sock
 
-  runner_4:
+  # runner_4:
-    <<: *runner
+  #   <<: *runner
-    container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_4
+  #   container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_4
-    environment:
+  #   environment:
-      - CI_SERVER_URL=https://${GITLAB_HOST}
+  #     - RUNNER_DESCRIPTION=gitab-runner_4
-      - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
+  #   volumes:
-      - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
+  #     - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_4:/etc/gitlab-runner
-      - RUNNER_TOKEN=${RUNNER_TOKEN}
-      - RUNNER_DESCRIPTION=gitab-runner_4
-      - RUNNER_EXECUTOR=docker
-      - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-    volumes:
-      - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_4:/etc/gitlab-runner
-      - /var/run/docker.sock:/var/run/docker.sock