From 491a0df73bb695daebd75aca7578eb2527c977ca Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 10 Mar 2025 09:21:43 +0100 Subject: [PATCH] lala --- regsync/stack.env | 8 ++++---- semaphore/docker-compose.yml | 21 ++++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/regsync/stack.env b/regsync/stack.env index ddf20ef..60e0cc8 100644 --- a/regsync/stack.env +++ b/regsync/stack.env @@ -1,7 +1,7 @@ APPNAME=registry -HUB_USER=jaydee77 -HUB_PASS=dckr_pat_WUfjkuEEYYEFDI95myphANR7AUU -#HUB_USER=sectorq -#HUB_PASS=dckr_pat_7XN8zNgj8JRPq1mlS5IvMcxJDUA +# HUB_USER=jaydee77 +# HUB_PASS=dckr_pat_WUfjkuEEYYEFDI95myphANR7AUU +HUB_USER=sectorq +HUB_PASS=dckr_pat_7XN8zNgj8JRPq1mlS5IvMcxJDUA LOCAL_USER=jaydee LOCAL_PASS=l4c1j4yd33Du5lo diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 99be434..dd864a3 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -3,9 +3,8 @@ version: '2' services: db: - ports: - - 3306:3306 - image: mysql:8.0 + + image: ${DOCKER_REGISTRY:-}mysql:8.0 volumes: - /share/docker_data/semaphore/mysql/data:/var/lib/mysql environment: @@ -19,10 +18,13 @@ services: - 3002:3000 #image: semaphoreui/semaphore:latest - image: semaphoreui/semaphore:latest + image: ${DOCKER_REGISTRY:-}semaphoreui/semaphore:latest + dns: + - 192.168.77.101 + - 192.168.77.1 volumes: - /etc/localtime:/etc/localtime:ro - - /share/docker_data/semaphore/app/requirements.txt:/etc/semaphore/requirements.txt + - /share/docker_data/semaphore/app/:/etc/semaphore/ environment: SEMAPHORE_DB_USER: semaphore_user SEMAPHORE_DB_PASS: StrongPassw0rd @@ -36,14 +38,15 @@ services: SEMAPHORE_ADMIN: administrator SEMAPHORE_ACCESS_KEY_ENCRYPTION: MflCLIUF5bn6Lgkuwy4BoAdIFhoZ4Ief2oocXmuZSjs= SEMAPHORE_LDAP_ACTIVATED: 'no' # if you wish to use ldap, set to: 'yes' - SEMAPHORE_LDAP_HOST: '192.168.77.106' - SEMAPHORE_LDAP_PORT: '389' + SEMAPHORE_LDAP_HOST: '192.168.77.101' + SEMAPHORE_LDAP_PORT: '2389' SEMAPHORE_LDAP_NEEDTLS: 'no' - SEMAPHORE_LDAP_DN_BIND: 'cn=admin,dc=sectorq,dc=eu' + SEMAPHORE_LDAP_DN_BIND: 'cn=jaydee,ou=users,dc=sectorq,dc=eu' SEMAPHORE_LDAP_PASSWORD: '$LDAP_ADMIN_PASSWORD' SEMAPHORE_LDAP_DN_SEARCH: 'dc=sectorq,dc=eu' SEMAPHORE_LDAP_SEARCH_FILTER: "(&(objectClass=inetOrgPerson)(uid=%s))" - + labels: + com.centurylinklabs.watchtower.enable: true depends_on: - db restart: always \ No newline at end of file