Compare commits
1 Commits
lesson6-s3
...
lesson7-ap
| Author | SHA1 | Date | |
|---|---|---|---|
| ebb85c44bc |
2
Addons/api-cleaner/.env.example
Normal file
2
Addons/api-cleaner/.env.example
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
GITLAB_TOKEN=glpat-XXX
|
||||||
|
GITLAB_SERVER=https://git.realmanual.ru/api/v4
|
||||||
12
Addons/api-cleaner/gitlab_cleaner.sh
Executable file
12
Addons/api-cleaner/gitlab_cleaner.sh
Executable file
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
source .env
|
||||||
|
|
||||||
|
USERS_LIST=$(curl -s --header "Authorization: Bearer $GITLAB_TOKEN" "${GITLAB_SERVER}/users?per_page=100" | jq -r '.[] | select( .state == "deactivated" and .is_admin == false).id')
|
||||||
|
|
||||||
|
echo $USERS_LIST
|
||||||
|
|
||||||
|
for user in ${USERS_LIST[@]}; do
|
||||||
|
echo "delete user_id: $user"
|
||||||
|
curl -s --request DELETE --header "Authorization: Bearer $GITLAB_TOKEN" "${GITLAB_SERVER}/users/$user"
|
||||||
|
done
|
||||||
@@ -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
|
|
||||||
@@ -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}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"Version": "2012-10-17",
|
|
||||||
"Statement": [
|
|
||||||
{
|
|
||||||
"Effect": "Allow",
|
|
||||||
"Action": [
|
|
||||||
"s3:*"
|
|
||||||
],
|
|
||||||
"Resource": [
|
|
||||||
"arn:aws:s3:::gitlab-storage/*"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -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,69 +172,47 @@ 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
|
||||||
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
|
|
||||||
|
|||||||
Reference in New Issue
Block a user