From 8a5b3f939684084566f953aa8d38e4ea5128462c Mon Sep 17 00:00:00 2001 From: jaydee Date: Thu, 14 Sep 2023 12:04:24 +0200 Subject: [PATCH 01/49] upt playbook --- openldap/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/openldap/docker-compose.yml b/openldap/docker-compose.yml index 9ad5a72..71240c2 100644 --- a/openldap/docker-compose.yml +++ b/openldap/docker-compose.yml @@ -20,6 +20,7 @@ services: - LDAP_CONFIG_ADMIN_USERNAME=admin - LDAP_CONFIG_ADMIN_PASSWORD=l4c1j4yd33Du5lo #- LDAP_CUSTOM_SCHEMA_FILE=/custom/00-custom.ldif + - LDAP_ENABLE_TLS volumes: - '/share/docker_data/openldap/data:/bitnami/openldap' - '/share/docker_data/openldap/ldifs:/ldifs' From a7b528de6f1ac25b989872d602cb5d329d4575ea Mon Sep 17 00:00:00 2001 From: jaydee Date: Thu, 14 Sep 2023 12:05:09 +0200 Subject: [PATCH 02/49] upt playbook --- openldap/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/openldap/docker-compose.yml b/openldap/docker-compose.yml index 71240c2..6317aad 100644 --- a/openldap/docker-compose.yml +++ b/openldap/docker-compose.yml @@ -21,6 +21,7 @@ services: - LDAP_CONFIG_ADMIN_PASSWORD=l4c1j4yd33Du5lo #- LDAP_CUSTOM_SCHEMA_FILE=/custom/00-custom.ldif - LDAP_ENABLE_TLS + volumes: - '/share/docker_data/openldap/data:/bitnami/openldap' - '/share/docker_data/openldap/ldifs:/ldifs' From ac2e2c2446fa6dd77d1caba886f67d22d3bfd3f8 Mon Sep 17 00:00:00 2001 From: jaydee Date: Thu, 14 Sep 2023 19:07:56 +0200 Subject: [PATCH 03/49] upt playbook --- bookstack/db_password | 1 - bookstack/db_root_password | 1 - bookstack/docker-compose.yml | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 bookstack/db_password delete mode 100644 bookstack/db_root_password diff --git a/bookstack/db_password b/bookstack/db_password deleted file mode 100644 index 2adc89a..0000000 --- a/bookstack/db_password +++ /dev/null @@ -1 +0,0 @@ -l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/db_root_password b/bookstack/db_root_password deleted file mode 100644 index 2adc89a..0000000 --- a/bookstack/db_root_password +++ /dev/null @@ -1 +0,0 @@ -l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 96697d7..2ea1843 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: "bookstack/db_password" + file: "bookstack/.env/db_password" db_root_password: - file: "bookstack/db_root_password" \ No newline at end of file + file: "bookstack/.env/db_root_password" \ No newline at end of file From ab6372e66143fee9be026ebfc1ed2c1b737b7b7e Mon Sep 17 00:00:00 2001 From: jaydee Date: Thu, 14 Sep 2023 19:11:40 +0200 Subject: [PATCH 04/49] upt playbook --- openldap/docker-compose.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/openldap/docker-compose.yml b/openldap/docker-compose.yml index 6317aad..f45ff9f 100644 --- a/openldap/docker-compose.yml +++ b/openldap/docker-compose.yml @@ -10,7 +10,7 @@ services: - LDAP_SKIP_DEFAULT_TREE=yes - LDAP_ROOT=dc=sectorq,dc=eu - LDAP_ADMIN_USERNAME=admin - - LDAP_ADMIN_PASSWORD=l4c1j4yd33Du5lo + - LDAP_ADMIN_PASSWORD=/run/secrets/ldap_admin_password - LDAP_USERS=test - LDAP_PASSWORDS=q - LDAP_GROUP=group @@ -18,14 +18,20 @@ services: #- LDAP_CUSTOM_LDIF_DIR=/ldifs - LDAP_CONFIG_ADMIN_ENABLED=yes - LDAP_CONFIG_ADMIN_USERNAME=admin - - LDAP_CONFIG_ADMIN_PASSWORD=l4c1j4yd33Du5lo + - LDAP_CONFIG_ADMIN_PASSWORD=/run/secrets/ldap_config_password #- LDAP_CUSTOM_SCHEMA_FILE=/custom/00-custom.ldif - - LDAP_ENABLE_TLS - + #- LDAP_ENABLE_TLS + secrets: + - ldap_config_password + - ldap_admin_password volumes: - '/share/docker_data/openldap/data:/bitnami/openldap' - '/share/docker_data/openldap/ldifs:/ldifs' - - '/share/docker_data/openldap/custom2:/custom' + - '/share/docker_data/openldap/custom:/custom' network_mode: bridge - +secrets: + ldap_config_password: + file: "openldap/.env/ldap_config_password" + ldap_admin_password: + file: "openldap/.env/ldap_admin_password" From c50ed4eb09e161c1b1d125b7a1a4e6a43de857af Mon Sep 17 00:00:00 2001 From: jaydee Date: Sat, 16 Sep 2023 09:53:10 +0200 Subject: [PATCH 05/49] upt playbook --- nextcloud/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index e36ce08..6c94656 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -49,6 +49,7 @@ services: restart: always labels: com.centurylinklabs.watchtower.enable: true + com.centurylinklabs.watchtower.lifecycle.post-update: "apt update;apt install cifs-utils samba-client" redis: image: redis:alpine container_name: redis From e476c3041f65e1756d434de0b8b9f34692ec3813 Mon Sep 17 00:00:00 2001 From: jaydee Date: Sat, 16 Sep 2023 09:54:01 +0200 Subject: [PATCH 06/49] upt playbook --- nextcloud/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 6c94656..a9daf73 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -49,7 +49,7 @@ services: restart: always labels: com.centurylinklabs.watchtower.enable: true - com.centurylinklabs.watchtower.lifecycle.post-update: "apt update;apt install cifs-utils samba-client" + com.centurylinklabs.watchtower.lifecycle.post-update: "apt update;apt install -y cifs-utils samba-client" redis: image: redis:alpine container_name: redis From 696b8a8d86f3faba2115e9e0493a4694e6e3c2fd Mon Sep 17 00:00:00 2001 From: jaydee Date: Sat, 16 Sep 2023 09:59:04 +0200 Subject: [PATCH 07/49] upt playbook --- nextcloud/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index a9daf73..4214f35 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -49,7 +49,7 @@ services: restart: always labels: com.centurylinklabs.watchtower.enable: true - com.centurylinklabs.watchtower.lifecycle.post-update: "apt update;apt install -y cifs-utils samba-client" + com.centurylinklabs.watchtower.lifecycle.post-update: "apt update;apt install -y smbclient" redis: image: redis:alpine container_name: redis From 1d3352b1504528efde0c2edda3424634f3ba0af4 Mon Sep 17 00:00:00 2001 From: jaydee Date: Sat, 16 Sep 2023 10:03:27 +0200 Subject: [PATCH 08/49] upt playbook --- nextcloud/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 4214f35..37c542a 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -49,7 +49,7 @@ services: restart: always labels: com.centurylinklabs.watchtower.enable: true - com.centurylinklabs.watchtower.lifecycle.post-update: "apt update;apt install -y smbclient" + com.centurylinklabs.watchtower.lifecycle.post-update: "apt update;apt install -y smbclient;chown -R www-data:www-data /var/www/html" redis: image: redis:alpine container_name: redis From 140ddd4507200609557c3852cb57d757f4ad5e03 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 18 Sep 2023 09:56:26 +0200 Subject: [PATCH 09/49] upt playbook --- nextcloud/docker-compose.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 37c542a..07dcc2f 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -13,9 +13,12 @@ services: command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed volumes: - /share/docker_data/mariadb:/var/lib/mysql + secrets: + - db_password + - db_root_password environment: - - MYSQL_ROOT_PASSWORD=l4c1j4yd33Du5lo - - MYSQL_PASSWORD=l4c1j4yd33Du5lo + - MYSQL_ROOT_PASSWORD=/run/secrets/db_root_password + - MYSQL_PASSWORD=/run/secrets/db_password - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud networks: @@ -36,8 +39,11 @@ services: - /share/docker_data/nextcloud/app-hooks/pre-upgrade:/docker-entrypoint-hooks.d/pre-upgrade - /share/docker_data/nextcloud/app-hooks/post-upgrade:/docker-entrypoint-hooks.d/post-upgrade - /share/docker_data/nextcloud/app-hooks/before-starting:/docker-entrypoint-hooks.d/before-starting + secrets: + - db_password + - db_root_password environment: - - MYSQL_PASSWORD=l4c1j4yd33Du5lo + - MYSQL_PASSWORD=/run/secrets/db_password - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - MYSQL_HOST=db @@ -59,4 +65,8 @@ services: - nextcloud_network restart: always - \ No newline at end of file +secrets: + db_password: + file: "nextcloud/.env/db_password" + db_root_password: + file: "nextcloud/.env/db_root_password" \ No newline at end of file From 8cf1c01d7c42d457c3d19537738fecdabad8f1b6 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 18 Sep 2023 09:56:40 +0200 Subject: [PATCH 10/49] upt playbook --- bookstack/.env/db_password | 1 + bookstack/.env/db_root_password | 1 + gitlab/docker-compose.yml | 49 +++++++++++++++++++++++++++++++++ nextcloud/.env/db_password | 0 nextcloud/.env/db_root_password | 0 5 files changed, 51 insertions(+) create mode 100644 bookstack/.env/db_password create mode 100644 bookstack/.env/db_root_password create mode 100644 gitlab/docker-compose.yml create mode 100644 nextcloud/.env/db_password create mode 100644 nextcloud/.env/db_root_password diff --git a/bookstack/.env/db_password b/bookstack/.env/db_password new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/bookstack/.env/db_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/.env/db_root_password b/bookstack/.env/db_root_password new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/bookstack/.env/db_root_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml new file mode 100644 index 0000000..73d41b6 --- /dev/null +++ b/gitlab/docker-compose.yml @@ -0,0 +1,49 @@ +version: '3.6' + +services: + web: + image: 'gitlab/gitlab-ce:latest' + container_name: gitlab + restart: always + network_mode: bridge + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'https://gitlab.sectorq.eu' + nginx['listen_port'] = 80 + nginx['listen_https'] = false + gitlab_rails['ldap_enabled'] = true + gitlab_rails['ldap_servers'] = { + 'main' => { + 'label' => 'LDAP', + 'host' => '192.168.77.106', + 'port' => 389, + 'uid' => 'sAMAccountName', + 'base' => 'dc=sectorq,dc=eu' + 'bind_dn' => 'CN=admin,DC=sectorq,DC=eu', + 'password' => 'l4c1j4yd33Du5lo', + 'encryption' => 'plain', + 'verify_certificates' => false, + 'timeout' => 10, + 'active_directory' => false, + 'user_filter' => '(employeeType=developer)', + 'base' => 'ou=people,dc=sectorq,dc=eu', + 'lowercase_usernames' => 'false', + 'retry_empty_result_with_codes' => [80], + 'allow_username_or_email_login' => false, + 'block_auto_created_users' => false + } + } + + hostname: 'gitlab.sectorq.eu' + ports: + - '8780:80' + - '8743:443' + - '8722:22' + volumes: + - '/share/docker_data/gitlab/config:/etc/gitlab' + - '/share/docker_data/gitlab/logs:/var/log/gitlab' + - '/share/docker_data/gitlab/data:/var/opt/gitlab' + + shm_size: '2gb' + labels: + com.centurylinklabs.watchtower.enable: true \ No newline at end of file diff --git a/nextcloud/.env/db_password b/nextcloud/.env/db_password new file mode 100644 index 0000000..e69de29 diff --git a/nextcloud/.env/db_root_password b/nextcloud/.env/db_root_password new file mode 100644 index 0000000..e69de29 From 004f0064aca99c1bc5a498a8b8274d3c847af9aa Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 18 Sep 2023 10:06:44 +0200 Subject: [PATCH 11/49] upt playbook --- nextcloud/.env/db_password | 1 + nextcloud/.env/db_root_password | 1 + 2 files changed, 2 insertions(+) diff --git a/nextcloud/.env/db_password b/nextcloud/.env/db_password index e69de29..2adc89a 100644 --- a/nextcloud/.env/db_password +++ b/nextcloud/.env/db_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file diff --git a/nextcloud/.env/db_root_password b/nextcloud/.env/db_root_password index e69de29..2adc89a 100644 --- a/nextcloud/.env/db_root_password +++ b/nextcloud/.env/db_root_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file From 61be58d2b99960d509d1b01c633a70dadd9c5f71 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 18 Sep 2023 10:25:10 +0200 Subject: [PATCH 12/49] upt playbook --- nextcloud/docker-compose.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 07dcc2f..709964f 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -13,12 +13,9 @@ services: command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed volumes: - /share/docker_data/mariadb:/var/lib/mysql - secrets: - - db_password - - db_root_password environment: - - MYSQL_ROOT_PASSWORD=/run/secrets/db_root_password - - MYSQL_PASSWORD=/run/secrets/db_password + - MYSQL_ROOT_PASSWORD=$DB_ROOT_PASSWORD + - MYSQL_PASSWORD=$DB_PASSWORD - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud networks: @@ -39,11 +36,8 @@ services: - /share/docker_data/nextcloud/app-hooks/pre-upgrade:/docker-entrypoint-hooks.d/pre-upgrade - /share/docker_data/nextcloud/app-hooks/post-upgrade:/docker-entrypoint-hooks.d/post-upgrade - /share/docker_data/nextcloud/app-hooks/before-starting:/docker-entrypoint-hooks.d/before-starting - secrets: - - db_password - - db_root_password environment: - - MYSQL_PASSWORD=/run/secrets/db_password + - MYSQL_PASSWORD=$DB_ROOT_PASSWORD - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - MYSQL_HOST=db @@ -64,9 +58,4 @@ services: networks: - nextcloud_network - restart: always -secrets: - db_password: - file: "nextcloud/.env/db_password" - db_root_password: - file: "nextcloud/.env/db_root_password" \ No newline at end of file + restart: always \ No newline at end of file From 25d8038cd0e91f10ade0395f07ac169050ce967f Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 18 Sep 2023 10:52:01 +0200 Subject: [PATCH 13/49] upt playbook --- bookstack/docker-compose.yml | 4 ++-- nextcloud/docker-compose.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 2ea1843..966df29 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: "bookstack/.env/db_password" + file: ".env/db_password" db_root_password: - file: "bookstack/.env/db_root_password" \ No newline at end of file + file: ".env/db_root_password" \ No newline at end of file diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 709964f..56f9041 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -14,8 +14,8 @@ services: volumes: - /share/docker_data/mariadb:/var/lib/mysql environment: - - MYSQL_ROOT_PASSWORD=$DB_ROOT_PASSWORD - - MYSQL_PASSWORD=$DB_PASSWORD + - MYSQL_ROOT_PASSWORD='$DB_ROOT_PASSWORD' + - MYSQL_PASSWORD='$DB_PASSWORD' - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud networks: @@ -37,7 +37,7 @@ services: - /share/docker_data/nextcloud/app-hooks/post-upgrade:/docker-entrypoint-hooks.d/post-upgrade - /share/docker_data/nextcloud/app-hooks/before-starting:/docker-entrypoint-hooks.d/before-starting environment: - - MYSQL_PASSWORD=$DB_ROOT_PASSWORD + - MYSQL_PASSWORD='$DB_ROOT_PASSWORD' - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - MYSQL_HOST=db From b9c241c5d5beb6b3b06605cd9304ba335abf4d72 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 18 Sep 2023 10:55:48 +0200 Subject: [PATCH 14/49] upt playbook --- webhub/docker-compose.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 webhub/docker-compose.yml diff --git a/webhub/docker-compose.yml b/webhub/docker-compose.yml new file mode 100644 index 0000000..24d04cf --- /dev/null +++ b/webhub/docker-compose.yml @@ -0,0 +1,30 @@ +--- +version: "2.1" +services: + heimdall: + image: lscr.io/linuxserver/heimdall:latest + container_name: heimdall + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Bratislava + volumes: + - /share/docker_data/heimdall/config:/config + + ports: + - 8084:80 + - 4437:443 + restart: always + labels: + com.centurylinklabs.watchtower.enable: true + web: + image: nginx:latest + restart: always + volumes: + + - /share/docker_data/webhub:/usr/share/nginx/html + ports: + - "48000:80" + environment: + - NGINX_HOST=sectorq.eu + - NGINX_PORT=80 \ No newline at end of file From 7b0fac51807ed3f908efd461a0206557af6ab83b Mon Sep 17 00:00:00 2001 From: jaydee Date: Wed, 20 Sep 2023 10:44:49 +0200 Subject: [PATCH 15/49] upt playbook --- openldap/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openldap/docker-compose.yml b/openldap/docker-compose.yml index f45ff9f..6878fe2 100644 --- a/openldap/docker-compose.yml +++ b/openldap/docker-compose.yml @@ -32,6 +32,6 @@ services: network_mode: bridge secrets: ldap_config_password: - file: "openldap/.env/ldap_config_password" + file: ".env/ldap_config_password" ldap_admin_password: - file: "openldap/.env/ldap_admin_password" + file: ".env/ldap_admin_password" From a0e36d2fbd7d07e337a1a8a08b6c2763d008b412 Mon Sep 17 00:00:00 2001 From: jaydee Date: Wed, 20 Sep 2023 10:55:28 +0200 Subject: [PATCH 16/49] upt playbook --- openldap/docker-compose.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/openldap/docker-compose.yml b/openldap/docker-compose.yml index 6878fe2..d93d0f4 100644 --- a/openldap/docker-compose.yml +++ b/openldap/docker-compose.yml @@ -10,7 +10,7 @@ services: - LDAP_SKIP_DEFAULT_TREE=yes - LDAP_ROOT=dc=sectorq,dc=eu - LDAP_ADMIN_USERNAME=admin - - LDAP_ADMIN_PASSWORD=/run/secrets/ldap_admin_password + - LDAP_ADMIN_PASSWORD=$LDAP_ADMIN_PASSWORD - LDAP_USERS=test - LDAP_PASSWORDS=q - LDAP_GROUP=group @@ -18,20 +18,12 @@ services: #- LDAP_CUSTOM_LDIF_DIR=/ldifs - LDAP_CONFIG_ADMIN_ENABLED=yes - LDAP_CONFIG_ADMIN_USERNAME=admin - - LDAP_CONFIG_ADMIN_PASSWORD=/run/secrets/ldap_config_password + - LDAP_CONFIG_ADMIN_PASSWORD=$LDAP_CONFIG_ADMIN_PASSWORD #- LDAP_CUSTOM_SCHEMA_FILE=/custom/00-custom.ldif #- LDAP_ENABLE_TLS - secrets: - - ldap_config_password - - ldap_admin_password volumes: - '/share/docker_data/openldap/data:/bitnami/openldap' - '/share/docker_data/openldap/ldifs:/ldifs' - '/share/docker_data/openldap/custom:/custom' - network_mode: bridge -secrets: - ldap_config_password: - file: ".env/ldap_config_password" - ldap_admin_password: - file: ".env/ldap_admin_password" + network_mode: bridge \ No newline at end of file From 585c49badcb21f6ab37a1dcef15cec905563c8c7 Mon Sep 17 00:00:00 2001 From: jaydee Date: Wed, 20 Sep 2023 12:02:20 +0200 Subject: [PATCH 17/49] upt playbook --- semaphore/docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index f4d841b..6b92090 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -19,6 +19,8 @@ services: - 3002:3000 image: ansiblesemaphore/semaphore:latest container_name: semaphore + volumes: + - /etc/localtime:/etc/localtime:ro environment: SEMAPHORE_DB_USER: semaphore_user SEMAPHORE_DB_PASS: StrongPassw0rd @@ -26,9 +28,9 @@ services: SEMAPHORE_DB_PORT: 3306 SEMAPHORE_DB: semaphore_db SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/ - SEMAPHORE_ADMIN_PASSWORD: AdminPasswd + SEMAPHORE_ADMIN_PASSWORD: AdminPassword SEMAPHORE_ADMIN_NAME: administrator - SEMAPHORE_ADMIN_EMAIL: admin@sectorq.eu + SEMAPHORE_ADMIN_EMAIL: admin@sectorq.e SEMAPHORE_ADMIN: administrator SEMAPHORE_ACCESS_KEY_ENCRYPTION: MflCLIUF5bn6Lgkuwy4BoAdIFhoZ4Ief2oocXmuZSjs= SEMAPHORE_LDAP_ACTIVATED: 'yes' # if you wish to use ldap, set to: 'yes' From cdaa530fddfee2ed44fe195b83c0960ca7d81cbe Mon Sep 17 00:00:00 2001 From: jaydee Date: Sun, 24 Sep 2023 09:51:11 +0200 Subject: [PATCH 18/49] upt playbook --- home-assistant/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-assistant/docker-compose.yaml b/home-assistant/docker-compose.yaml index 932d862..ba7f1f7 100644 --- a/home-assistant/docker-compose.yaml +++ b/home-assistant/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3' services: homeassistant: - container_name: HomeAssistant1 + container_name: HomeAssistant network_mode: host image: "ghcr.io/home-assistant/home-assistant:latest" volumes: From 7839757854af73270cba9e7b2cab3a550984cf93 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 25 Sep 2023 09:44:18 +0200 Subject: [PATCH 19/49] upt playbook --- dockermon/docker-compose.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 dockermon/docker-compose.yml diff --git a/dockermon/docker-compose.yml b/dockermon/docker-compose.yml new file mode 100644 index 0000000..b9e7286 --- /dev/null +++ b/dockermon/docker-compose.yml @@ -0,0 +1,9 @@ + docker_mon: + image: philhawthorne/ha-dockermon + + restart: always + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /share/docker_data/dockermon/config:/config + ports: + - 8126:8126 \ No newline at end of file From 3005658feb9d1733a4456a37854212ced6bbe078 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 25 Sep 2023 09:47:00 +0200 Subject: [PATCH 20/49] upt playbook --- dockermon/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dockermon/docker-compose.yml b/dockermon/docker-compose.yml index b9e7286..c6f42e2 100644 --- a/dockermon/docker-compose.yml +++ b/dockermon/docker-compose.yml @@ -1,3 +1,6 @@ +version: '2' + +services: docker_mon: image: philhawthorne/ha-dockermon From 1ca274c3fcc61e81d4c73bc59b8c95c89089c2c6 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 25 Sep 2023 12:54:55 +0200 Subject: [PATCH 21/49] upt playbook --- home-assistant/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-assistant/docker-compose.yaml b/home-assistant/docker-compose.yaml index ba7f1f7..52c421b 100644 --- a/home-assistant/docker-compose.yaml +++ b/home-assistant/docker-compose.yaml @@ -9,7 +9,7 @@ services: - /etc/localtime:/etc/localtime:ro - /dev/ttyUSB0:/dev/ttyUSB0 - /var/log:/logging - - /var/run/docker.sock:/var/run/docker.sock + #- /var/run/docker.sock:/var/run/docker.sock privileged: true labels: From 287900f9c45297c29a28c54bb80c6403a307950b Mon Sep 17 00:00:00 2001 From: jaydee Date: Wed, 27 Sep 2023 11:42:08 +0200 Subject: [PATCH 22/49] upt playbook --- openldap/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openldap/docker-compose.yml b/openldap/docker-compose.yml index d93d0f4..e1b6ecf 100644 --- a/openldap/docker-compose.yml +++ b/openldap/docker-compose.yml @@ -3,9 +3,9 @@ version: '2' services: openldap: image: bitnami/openldap:latest - ports: - - '1389:1389' - - '1636:1636' + #ports: + # - '1389:1389' + # - '1636:1636' environment: - LDAP_SKIP_DEFAULT_TREE=yes - LDAP_ROOT=dc=sectorq,dc=eu @@ -26,4 +26,4 @@ services: - '/share/docker_data/openldap/ldifs:/ldifs' - '/share/docker_data/openldap/custom:/custom' - network_mode: bridge \ No newline at end of file + network_mode: host \ No newline at end of file From 419a0a0592eeb150df2b2b52d41c756adf5dedf1 Mon Sep 17 00:00:00 2001 From: jaydee Date: Wed, 27 Sep 2023 11:46:04 +0200 Subject: [PATCH 23/49] upt playbook --- semaphore/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 6b92090..1679775 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -30,7 +30,7 @@ services: SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/ SEMAPHORE_ADMIN_PASSWORD: AdminPassword SEMAPHORE_ADMIN_NAME: administrator - SEMAPHORE_ADMIN_EMAIL: admin@sectorq.e + SEMAPHORE_ADMIN_EMAIL: admin@sectorq.eu SEMAPHORE_ADMIN: administrator SEMAPHORE_ACCESS_KEY_ENCRYPTION: MflCLIUF5bn6Lgkuwy4BoAdIFhoZ4Ief2oocXmuZSjs= SEMAPHORE_LDAP_ACTIVATED: 'yes' # if you wish to use ldap, set to: 'yes' From 89455e6c5c7bea5d99a2b194ce956b7487b6a1cf Mon Sep 17 00:00:00 2001 From: jaydee Date: Wed, 27 Sep 2023 11:51:21 +0200 Subject: [PATCH 24/49] upt playbook --- gitlab/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml index 73d41b6..18b263d 100644 --- a/gitlab/docker-compose.yml +++ b/gitlab/docker-compose.yml @@ -16,7 +16,7 @@ services: 'main' => { 'label' => 'LDAP', 'host' => '192.168.77.106', - 'port' => 389, + 'port' => 1389, 'uid' => 'sAMAccountName', 'base' => 'dc=sectorq,dc=eu' 'bind_dn' => 'CN=admin,DC=sectorq,DC=eu', @@ -25,7 +25,7 @@ services: 'verify_certificates' => false, 'timeout' => 10, 'active_directory' => false, - 'user_filter' => '(employeeType=developer)', + 'user_filter' => '(memberOf=cn=gitlab,ou=group,dc=sectorq,dc=eu)', 'base' => 'ou=people,dc=sectorq,dc=eu', 'lowercase_usernames' => 'false', 'retry_empty_result_with_codes' => [80], From 2d2740402bf4941fe040e8025fb1c15cb75ae79e Mon Sep 17 00:00:00 2001 From: jaydee Date: Wed, 4 Oct 2023 11:11:56 +0200 Subject: [PATCH 25/49] upt playbook --- home-assistant/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-assistant/docker-compose.yaml b/home-assistant/docker-compose.yaml index 52c421b..ba7f1f7 100644 --- a/home-assistant/docker-compose.yaml +++ b/home-assistant/docker-compose.yaml @@ -9,7 +9,7 @@ services: - /etc/localtime:/etc/localtime:ro - /dev/ttyUSB0:/dev/ttyUSB0 - /var/log:/logging - #- /var/run/docker.sock:/var/run/docker.sock + - /var/run/docker.sock:/var/run/docker.sock privileged: true labels: From b8bcd9c1a6860789eceee4fec19a82a2c8f3cce7 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 23 Oct 2023 08:25:23 +0200 Subject: [PATCH 26/49] upt playbook --- fail2ban/docker-compose.yaml | 10 +++++++--- semaphore/docker-compose.yml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fail2ban/docker-compose.yaml b/fail2ban/docker-compose.yaml index 6858511..b0325dd 100644 --- a/fail2ban/docker-compose.yaml +++ b/fail2ban/docker-compose.yaml @@ -4,16 +4,20 @@ services: fail2ban: image: crazymax/fail2ban:latest container_name: fail2ban - network_mode: "host" + network_mode: host cap_add: - NET_ADMIN - NET_RAW volumes: - "/share/docker_data/fail2ban/data:/data" - "/var/log:/var/log" - - "/share/docker_data/nextcloud/data/nextcloud.log:/nextcloud.log:ro" + #- "/share/docker_data/nextcloud/data/nextcloud.log:/nextcloud.log:ro" + - type: bind + source: /share/docker_data/nextcloud/data/nextcloud.log + target: /nextcloud.log + read_only: true env_file: - - "fail2ban.env" + - /data/fail2ban.env restart: always labels: com.centurylinklabs.watchtower.enable: true \ No newline at end of file diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 1679775..5b13ea2 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: - mysql: + semaphore-mysql: ports: - 3306:3306 image: mysql:5.6 From c30598b391018e732b843b21a5e290d0ff241814 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 23 Oct 2023 08:30:25 +0200 Subject: [PATCH 27/49] upt playbook --- semaphore/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 5b13ea2..9db2d0e 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -6,7 +6,7 @@ services: ports: - 3306:3306 image: mysql:5.6 - container_name: mysql + container_name: semaphore-mysql hostname: mysql environment: MYSQL_RANDOM_ROOT_PASSWORD: 'yes' @@ -43,5 +43,5 @@ services: SEMAPHORE_LDAP_SEARCH_FILTER: "(&(objectClass=inetOrgPerson)(uid=%s))" depends_on: - - mysql + - semaphore-mysql restart: always \ No newline at end of file From 4430e99d41f918e23ee31c4c36bb026b6f9bf097 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 23 Oct 2023 10:22:50 +0200 Subject: [PATCH 28/49] upt playbook --- semaphore/docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 9db2d0e..ad4a8e5 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -8,6 +8,8 @@ services: image: mysql:5.6 container_name: semaphore-mysql hostname: mysql + volumes: + - /share/docker_data/semaphore/mysql/data:/docker-entrypoint-initdb.d environment: MYSQL_RANDOM_ROOT_PASSWORD: 'yes' MYSQL_DATABASE: semaphore_db @@ -26,11 +28,11 @@ services: SEMAPHORE_DB_PASS: StrongPassw0rd SEMAPHORE_DB_HOST: mysql SEMAPHORE_DB_PORT: 3306 - SEMAPHORE_DB: semaphore_db + SEMAPHORE_DB: semaphore_db SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/ SEMAPHORE_ADMIN_PASSWORD: AdminPassword SEMAPHORE_ADMIN_NAME: administrator - SEMAPHORE_ADMIN_EMAIL: admin@sectorq.eu + SEMAPHORE_ADMIN_EMAIL: administrator@sectorq.eu SEMAPHORE_ADMIN: administrator SEMAPHORE_ACCESS_KEY_ENCRYPTION: MflCLIUF5bn6Lgkuwy4BoAdIFhoZ4Ief2oocXmuZSjs= SEMAPHORE_LDAP_ACTIVATED: 'yes' # if you wish to use ldap, set to: 'yes' From bebaa216f3bb693d41b10cb285bdc2e7a2a74605 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 23 Oct 2023 13:02:54 +0200 Subject: [PATCH 29/49] upt playbook --- nextcloud/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 56f9041..cb37858 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -52,7 +52,6 @@ services: com.centurylinklabs.watchtower.lifecycle.post-update: "apt update;apt install -y smbclient;chown -R www-data:www-data /var/www/html" redis: image: redis:alpine - container_name: redis volumes: - /share/docker_data/redis:/data networks: From 1518a6ba2fdc48409cbd5af229360958759c5214 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 23 Oct 2023 13:08:58 +0200 Subject: [PATCH 30/49] upt playbook --- bookstack/docker-compose.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 966df29..061dc1f 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -1,7 +1,7 @@ --- version: "2" services: - bookstack: + app: image: lscr.io/linuxserver/bookstack container_name: bookstack secrets: @@ -21,10 +21,9 @@ services: - 6875:80 restart: unless-stopped depends_on: - - bookstack_db - bookstack_db: + - db + db: image: lscr.io/linuxserver/mariadb - container_name: bookstack_db secrets: - db_password - db_root_password From 1e6fcbdeea3b42e96d6629591dd99491602ec234 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 23 Oct 2023 13:09:32 +0200 Subject: [PATCH 31/49] upt playbook --- bookstack/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 061dc1f..b275469 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -3,7 +3,6 @@ version: "2" services: app: image: lscr.io/linuxserver/bookstack - container_name: bookstack secrets: - db_password environment: From fae40881ff999b681dcffdf7f7f2e5cd67aa69db Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 23 Oct 2023 13:11:35 +0200 Subject: [PATCH 32/49] upt playbook --- semaphore/docker-compose.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index ad4a8e5..4701a22 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -2,11 +2,10 @@ version: '2' services: - semaphore-mysql: + db: ports: - 3306:3306 image: mysql:5.6 - container_name: semaphore-mysql hostname: mysql volumes: - /share/docker_data/semaphore/mysql/data:/docker-entrypoint-initdb.d @@ -16,11 +15,10 @@ services: MYSQL_USER: semaphore_user MYSQL_PASSWORD: StrongPassw0rd restart: always - semaphore: + app: ports: - 3002:3000 image: ansiblesemaphore/semaphore:latest - container_name: semaphore volumes: - /etc/localtime:/etc/localtime:ro environment: @@ -45,5 +43,5 @@ services: SEMAPHORE_LDAP_SEARCH_FILTER: "(&(objectClass=inetOrgPerson)(uid=%s))" depends_on: - - semaphore-mysql + - db restart: always \ No newline at end of file From d1996fb0214c786bacfa816a471a42d1b618d045 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 23 Oct 2023 13:33:16 +0200 Subject: [PATCH 33/49] upt playbook --- semaphore/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 4701a22..4181175 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -8,7 +8,7 @@ services: image: mysql:5.6 hostname: mysql volumes: - - /share/docker_data/semaphore/mysql/data:/docker-entrypoint-initdb.d + - /share/docker_data/semaphore/mysql/data:/var/lib/mysql environment: MYSQL_RANDOM_ROOT_PASSWORD: 'yes' MYSQL_DATABASE: semaphore_db From 4701d9f974deba5909d287d137975c09ad15f131 Mon Sep 17 00:00:00 2001 From: jaydee Date: Tue, 24 Oct 2023 12:08:37 +0200 Subject: [PATCH 34/49] upt playbook --- semaphore/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 4181175..3c94887 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -5,7 +5,7 @@ services: db: ports: - 3306:3306 - image: mysql:5.6 + image: mysql:8.0 hostname: mysql volumes: - /share/docker_data/semaphore/mysql/data:/var/lib/mysql @@ -18,7 +18,7 @@ services: app: ports: - 3002:3000 - image: ansiblesemaphore/semaphore:latest + image: semaphoreui/semaphore:latest volumes: - /etc/localtime:/etc/localtime:ro environment: @@ -28,7 +28,7 @@ services: SEMAPHORE_DB_PORT: 3306 SEMAPHORE_DB: semaphore_db SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/ - SEMAPHORE_ADMIN_PASSWORD: AdminPassword + SEMAPHORE_ADMIN_PASSWORD: l4c1j4yd33Du5lo SEMAPHORE_ADMIN_NAME: administrator SEMAPHORE_ADMIN_EMAIL: administrator@sectorq.eu SEMAPHORE_ADMIN: administrator From 0a5f5b7122cb28afe1d265c7897eb5ca19cc88d1 Mon Sep 17 00:00:00 2001 From: jaydee Date: Tue, 24 Oct 2023 12:16:38 +0200 Subject: [PATCH 35/49] upt playbook --- semaphore/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 3c94887..1f6fc96 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -24,7 +24,7 @@ services: environment: SEMAPHORE_DB_USER: semaphore_user SEMAPHORE_DB_PASS: StrongPassw0rd - SEMAPHORE_DB_HOST: mysql + SEMAPHORE_DB_HOST: db SEMAPHORE_DB_PORT: 3306 SEMAPHORE_DB: semaphore_db SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/ From f96e5fc5702e6c64de95213b212103beca3aef7e Mon Sep 17 00:00:00 2001 From: jaydee Date: Tue, 24 Oct 2023 12:18:08 +0200 Subject: [PATCH 36/49] upt playbook --- semaphore/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 1f6fc96..0ceabce 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -5,7 +5,7 @@ services: db: ports: - 3306:3306 - image: mysql:8.0 + image: mysql:5.6 hostname: mysql volumes: - /share/docker_data/semaphore/mysql/data:/var/lib/mysql @@ -24,7 +24,7 @@ services: environment: SEMAPHORE_DB_USER: semaphore_user SEMAPHORE_DB_PASS: StrongPassw0rd - SEMAPHORE_DB_HOST: db + SEMAPHORE_DB_HOST: mysql SEMAPHORE_DB_PORT: 3306 SEMAPHORE_DB: semaphore_db SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/ From da1d0c952e33eda1f3a9418fc52f613afbdff6cd Mon Sep 17 00:00:00 2001 From: jaydee Date: Tue, 24 Oct 2023 14:32:41 +0200 Subject: [PATCH 37/49] upt playbook --- semaphore/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 0ceabce..d8fd9ce 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -21,6 +21,7 @@ services: image: semaphoreui/semaphore:latest volumes: - /etc/localtime:/etc/localtime:ro + #- /share/docker_data/semaphore/app/requirements.txt:/etc/semaphore/requirements.txt environment: SEMAPHORE_DB_USER: semaphore_user SEMAPHORE_DB_PASS: StrongPassw0rd From 30b9768911301c59e6937ac00085b2699d98dafa Mon Sep 17 00:00:00 2001 From: jaydee Date: Tue, 24 Oct 2023 14:32:54 +0200 Subject: [PATCH 38/49] upt playbook --- semaphore/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index d8fd9ce..7e9773e 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -21,7 +21,7 @@ services: image: semaphoreui/semaphore:latest volumes: - /etc/localtime:/etc/localtime:ro - #- /share/docker_data/semaphore/app/requirements.txt:/etc/semaphore/requirements.txt + - /share/docker_data/semaphore/app/requirements.txt:/etc/semaphore/requirements.txt environment: SEMAPHORE_DB_USER: semaphore_user SEMAPHORE_DB_PASS: StrongPassw0rd From 6fa6a4ff80ecb3d69ea809fd14786b42d0af9bd9 Mon Sep 17 00:00:00 2001 From: jaydee Date: Thu, 26 Oct 2023 18:16:43 +0200 Subject: [PATCH 39/49] upt playbook --- semaphore/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 7e9773e..069344c 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -5,7 +5,7 @@ services: db: ports: - 3306:3306 - image: mysql:5.6 + image: mysql:8.0 hostname: mysql volumes: - /share/docker_data/semaphore/mysql/data:/var/lib/mysql From 0e8eba6e5d27e98e6469d2e9f2be0f41af3426c3 Mon Sep 17 00:00:00 2001 From: jaydee Date: Thu, 26 Oct 2023 18:29:09 +0200 Subject: [PATCH 40/49] upt playbook --- semaphore/docker-compose.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 069344c..c110c94 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -6,7 +6,6 @@ services: ports: - 3306:3306 image: mysql:8.0 - hostname: mysql volumes: - /share/docker_data/semaphore/mysql/data:/var/lib/mysql environment: @@ -25,11 +24,11 @@ services: environment: SEMAPHORE_DB_USER: semaphore_user SEMAPHORE_DB_PASS: StrongPassw0rd - SEMAPHORE_DB_HOST: mysql + SEMAPHORE_DB_HOST: db SEMAPHORE_DB_PORT: 3306 SEMAPHORE_DB: semaphore_db SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/ - SEMAPHORE_ADMIN_PASSWORD: l4c1j4yd33Du5lo + SEMAPHORE_ADMIN_PASSWORD: '$SEMAPHORE_ADMIN_PASSWORD' SEMAPHORE_ADMIN_NAME: administrator SEMAPHORE_ADMIN_EMAIL: administrator@sectorq.eu SEMAPHORE_ADMIN: administrator @@ -39,7 +38,7 @@ services: SEMAPHORE_LDAP_PORT: '389' SEMAPHORE_LDAP_NEEDTLS: 'no' SEMAPHORE_LDAP_DN_BIND: 'cn=admin,dc=sectorq,dc=eu' - SEMAPHORE_LDAP_PASSWORD: 'l4c1j4yd33Du5lo' + SEMAPHORE_LDAP_PASSWORD: '$LDAP_ADMIN_PASSWORD' SEMAPHORE_LDAP_DN_SEARCH: 'dc=sectorq,dc=eu' SEMAPHORE_LDAP_SEARCH_FILTER: "(&(objectClass=inetOrgPerson)(uid=%s))" From b32c83015df1606ccc01d7a693b0fe856a45b32d Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 27 Oct 2023 06:43:20 +0200 Subject: [PATCH 41/49] upt playbook --- gitlab/docker-compose.yml | 2 +- semaphore/docker-compose.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml index 18b263d..a457540 100644 --- a/gitlab/docker-compose.yml +++ b/gitlab/docker-compose.yml @@ -20,7 +20,7 @@ services: 'uid' => 'sAMAccountName', 'base' => 'dc=sectorq,dc=eu' 'bind_dn' => 'CN=admin,DC=sectorq,DC=eu', - 'password' => 'l4c1j4yd33Du5lo', + 'password' => '$LDAP_ADMIN_PASSWORD', 'encryption' => 'plain', 'verify_certificates' => false, 'timeout' => 10, diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index c110c94..d1eb9f4 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -17,6 +17,8 @@ services: app: ports: - 3002:3000 + uid: 0 + gid: 0 image: semaphoreui/semaphore:latest volumes: - /etc/localtime:/etc/localtime:ro From 7b72b994b2229e8b74084f1b11b6f06e960b9d7b Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 27 Oct 2023 06:44:53 +0200 Subject: [PATCH 42/49] upt playbook --- semaphore/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index d1eb9f4..a6727fc 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -17,8 +17,8 @@ services: app: ports: - 3002:3000 - uid: 0 - gid: 0 + PUID: 0 + PGID: 0 image: semaphoreui/semaphore:latest volumes: - /etc/localtime:/etc/localtime:ro From c818ada33e71014db45056622d616a5305fd159f Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 27 Oct 2023 06:45:48 +0200 Subject: [PATCH 43/49] upt playbook --- semaphore/docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index a6727fc..ae70cd5 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -17,13 +17,14 @@ services: app: ports: - 3002:3000 - PUID: 0 - PGID: 0 + image: semaphoreui/semaphore:latest volumes: - /etc/localtime:/etc/localtime:ro - /share/docker_data/semaphore/app/requirements.txt:/etc/semaphore/requirements.txt environment: + PUID: 0 + PGID: 0 SEMAPHORE_DB_USER: semaphore_user SEMAPHORE_DB_PASS: StrongPassw0rd SEMAPHORE_DB_HOST: db From 37bc3a0f0755eaa6cbc594df3c72ee6f1b289024 Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 27 Oct 2023 07:38:48 +0200 Subject: [PATCH 44/49] upt playbook --- bookstack/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index b275469..a0906ff 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -27,8 +27,8 @@ services: - db_password - db_root_password environment: - PUID: 1000 - PGID: 1000 + PUID: 0 + PGID: 0 MYSQL_ROOT_PASSWORD: /run/secrets/db_root_password TZ: Europe/London MYSQL_DATABASE: bookstackapp From 3496cdd3320eeda57ea8e2a92a27e5bc1902b1dc Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 27 Oct 2023 07:47:38 +0200 Subject: [PATCH 45/49] upt playbook --- semaphore/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index ae70cd5..17c01ba 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -18,7 +18,8 @@ services: ports: - 3002:3000 - image: semaphoreui/semaphore:latest + #image: semaphoreui/semaphore:latest + image: sectorq/semaphore:1.0 volumes: - /etc/localtime:/etc/localtime:ro - /share/docker_data/semaphore/app/requirements.txt:/etc/semaphore/requirements.txt From b069cbc99d8a8e57fe090a1c8c56b19df477bbbf Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 27 Oct 2023 07:48:29 +0200 Subject: [PATCH 46/49] upt playbook --- semaphore/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 17c01ba..fd57298 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -19,7 +19,7 @@ services: - 3002:3000 #image: semaphoreui/semaphore:latest - image: sectorq/semaphore:1.0 + image: semaphore:1.0 volumes: - /etc/localtime:/etc/localtime:ro - /share/docker_data/semaphore/app/requirements.txt:/etc/semaphore/requirements.txt From ef4582116a5c12561390881db9e10178cf6967a7 Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 27 Oct 2023 07:52:46 +0200 Subject: [PATCH 47/49] upt playbook --- semaphore/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index fd57298..17c01ba 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -19,7 +19,7 @@ services: - 3002:3000 #image: semaphoreui/semaphore:latest - image: semaphore:1.0 + image: sectorq/semaphore:1.0 volumes: - /etc/localtime:/etc/localtime:ro - /share/docker_data/semaphore/app/requirements.txt:/etc/semaphore/requirements.txt From ee76e4e568890ea737c3ed996f1d8556e023b53b Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 27 Oct 2023 07:59:17 +0200 Subject: [PATCH 48/49] upt playbook --- bookstack/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index a0906ff..09f3177 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -9,7 +9,7 @@ services: PUID: 1000 PGID: 1000 APP_URL: http://192.168.77.106:6875 - DB_HOST: bookstack_db + DB_HOST: db DB_PORT: 3306 DB_USER: bookstack DB_PASS: /run/secrets/db_password From 7c8dee38f0fa4ce573da43f6b570d64c505daaf8 Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 27 Oct 2023 08:06:37 +0200 Subject: [PATCH 49/49] upt playbook --- semaphore/docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 17c01ba..83f7eef 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -19,13 +19,11 @@ services: - 3002:3000 #image: semaphoreui/semaphore:latest - image: sectorq/semaphore:1.0 + image: sectorq/semaphore:latest volumes: - /etc/localtime:/etc/localtime:ro - /share/docker_data/semaphore/app/requirements.txt:/etc/semaphore/requirements.txt environment: - PUID: 0 - PGID: 0 SEMAPHORE_DB_USER: semaphore_user SEMAPHORE_DB_PASS: StrongPassw0rd SEMAPHORE_DB_HOST: db