add policy

.gitignore

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

Addons/cleaner/.env.axample

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,16 @@
+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

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

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