pub/gitlab-ci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: pub:lesson4-ci
Branches Tags
pub:main pub:lesson7-api pub:lesson6-s3 pub:lesson5-ci-tests pub:lesson4-ci pub:lesson3-ci pub:lesson2-runners
...
pull from: pub:lesson6-s3
Branches Tags
pub:main pub:lesson7-api pub:lesson6-s3 pub:lesson5-ci-tests pub:lesson4-ci pub:lesson3-ci pub:lesson2-runners

5 Commits
lesson4-ci ... lesson6-s3

Author SHA1 Message Date
Vassiliy Yegorov
e9c29b117c add policy 2022-09-27 18:02:13 +07:00
Vassiliy Yegorov
b1f61020af add cleaner 2022-09-27 17:43:31 +07:00
Vassiliy Yegorov
95c46bbda0 fix 2022-09-25 21:33:51 +07:00
Vassiliy Yegorov
24fd31fff4 init 2022-09-25 21:23:13 +07:00
Vassiliy Yegorov
cfdd245655 fix 2022-09-25 21:18:43 +07:00
5 changed files with 110 additions and 50 deletions
Expand all files Collapse all files

3
.gitignore vendored
View File

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

7
Addons/cleaner/.env.axample Normal file
View File

@@ -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

16
Addons/cleaner/docker-compose.yaml Normal file
View File

@@ -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}

14
Addons/minio-srotage/storage-policy.json Normal file
View File

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

120
docker-compose.yml
View File

@@ -128,14 +128,14 @@ services:
- REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
- REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry.crt - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry.crt
- REGISTRY_STORAGE_DELETE_ENABLED=true - 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: expose:
- 5000 - 5000
networks: networks:
@@ -172,47 +172,69 @@ services:
volumes: volumes:
- ${SERVICE_DATA}/${SERVICE_NAME}/redis:/var/lib/redis:Z - ${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
# environment: command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
# - RUNNER_DESCRIPTION=gitab-runner_2 environment:
# volumes: - CI_SERVER_URL=https://${GITLAB_HOST}
# - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_2:/etc/gitlab-runner - 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_3:
# <<: *runner <<: *runner
# container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_3 container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_3
# environment: environment:
# - RUNNER_DESCRIPTION=gitab-runner_3 - CI_SERVER_URL=https://${GITLAB_HOST}
# volumes: - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
# - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_3:/etc/gitlab-runner - 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_4:
# <<: *runner <<: *runner
# container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_4 container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_4
# environment: environment:
# - RUNNER_DESCRIPTION=gitab-runner_4 - CI_SERVER_URL=https://${GITLAB_HOST}
# volumes: - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
# - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_4:/etc/gitlab-runner - 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