From 0d4e8b6e8088a2f1439370220ba3803c41b521ac Mon Sep 17 00:00:00 2001 From: matthias Date: Fri, 27 Jan 2023 18:38:21 +0000 Subject: [PATCH] reorganized the file and folder structure --- .../cadvisor}/docker-compose.yml | 0 compose/gitea/docker-compose.yml | 29 ++++++++++++ .../grafana}/docker-compose.yml | 0 .../jenkins}/docker-compose.yml | 0 .../nextcloud}/docker-compose.yml | 0 .../nodeexporter}/docker-compose.yml | 0 .../proxymanager}/docker-compose.yml | 4 +- .../registrybrowser}/docker-compose.yml | 4 ++ .../reverseproxy}/docker-compose.yml | 0 .../reverseproxy}/init-letsencrypt.sh | 0 .../tado-exporter}/docker-compose.yml | 2 +- {jenkins => create/jenkins}/Dockerfile | 0 .../rclonebackup}/amd64/Dockerfile | 0 .../rclonebackup}/amd64/docker-entrypoint.sh | 0 .../rclonebackup}/arm64/Dockerfile | 0 .../rclonebackup}/arm64/docker-entrypoint.sh | 0 .../rclonebackup}/docker-entrypoint.sh | 0 gitea/docker-compose.yml | 44 ------------------- 18 files changed, 36 insertions(+), 47 deletions(-) rename {cadvisor => compose/cadvisor}/docker-compose.yml (100%) create mode 100644 compose/gitea/docker-compose.yml rename {grafana => compose/grafana}/docker-compose.yml (100%) rename {jenkins => compose/jenkins}/docker-compose.yml (100%) rename {nextcloud => compose/nextcloud}/docker-compose.yml (100%) rename {nodeexporter => compose/nodeexporter}/docker-compose.yml (100%) rename {proxymanager => compose/proxymanager}/docker-compose.yml (90%) rename {registrybrowser => compose/registrybrowser}/docker-compose.yml (85%) rename {reverseproxy => compose/reverseproxy}/docker-compose.yml (100%) rename {reverseproxy => compose/reverseproxy}/init-letsencrypt.sh (100%) rename {tado-exporter => compose/tado-exporter}/docker-compose.yml (82%) rename {jenkins => create/jenkins}/Dockerfile (100%) rename {rclonebackup => create/rclonebackup}/amd64/Dockerfile (100%) rename {rclonebackup => create/rclonebackup}/amd64/docker-entrypoint.sh (100%) rename {rclonebackup => create/rclonebackup}/arm64/Dockerfile (100%) rename {rclonebackup => create/rclonebackup}/arm64/docker-entrypoint.sh (100%) rename {rclonebackup => create/rclonebackup}/docker-entrypoint.sh (100%) delete mode 100644 gitea/docker-compose.yml diff --git a/cadvisor/docker-compose.yml b/compose/cadvisor/docker-compose.yml similarity index 100% rename from cadvisor/docker-compose.yml rename to compose/cadvisor/docker-compose.yml diff --git a/compose/gitea/docker-compose.yml b/compose/gitea/docker-compose.yml new file mode 100644 index 0000000..7660884 --- /dev/null +++ b/compose/gitea/docker-compose.yml @@ -0,0 +1,29 @@ +version: "3" + + +volumes: + gitea_data: + driver_opts: + type: nfs + o: addr=dockerstorage,nfsvers=4 + device: :/dockerstorage/gitea + + gitea_repository: + driver_opts: + type: nfs + o: addr=maurice,nfsvers=4 + device: :/git + +services: + server: + image: gitea/gitea:1.18.1 + + volumes: + - gitea_data:/data + - gitea_repository:/data/git/repo + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + ports: + - "3000:3000" + - "222:22" + diff --git a/grafana/docker-compose.yml b/compose/grafana/docker-compose.yml similarity index 100% rename from grafana/docker-compose.yml rename to compose/grafana/docker-compose.yml diff --git a/jenkins/docker-compose.yml b/compose/jenkins/docker-compose.yml similarity index 100% rename from jenkins/docker-compose.yml rename to compose/jenkins/docker-compose.yml diff --git a/nextcloud/docker-compose.yml b/compose/nextcloud/docker-compose.yml similarity index 100% rename from nextcloud/docker-compose.yml rename to compose/nextcloud/docker-compose.yml diff --git a/nodeexporter/docker-compose.yml b/compose/nodeexporter/docker-compose.yml similarity index 100% rename from nodeexporter/docker-compose.yml rename to compose/nodeexporter/docker-compose.yml diff --git a/proxymanager/docker-compose.yml b/compose/proxymanager/docker-compose.yml similarity index 90% rename from proxymanager/docker-compose.yml rename to compose/proxymanager/docker-compose.yml index e27973d..510e8ab 100644 --- a/proxymanager/docker-compose.yml +++ b/compose/proxymanager/docker-compose.yml @@ -5,13 +5,13 @@ volumes: driver_opts: type: nfs o: addr=dockerstorage,nfsvers=4 - device: :/swarm/stacks/proxymanager/data + device: :/dockerstorage/proxymanager/data letsencrypt: driver_opts: type: nfs o: addr=dockerstorage,nfsvers=4 - device: :/swarm/stacks/proxymanager/letsencrypt + device: :/dockerstorage/proxymanager/letsencrypt services: diff --git a/registrybrowser/docker-compose.yml b/compose/registrybrowser/docker-compose.yml similarity index 85% rename from registrybrowser/docker-compose.yml rename to compose/registrybrowser/docker-compose.yml index bfc765e..d1cc94d 100644 --- a/registrybrowser/docker-compose.yml +++ b/compose/registrybrowser/docker-compose.yml @@ -24,6 +24,9 @@ services: - REGISTRY_AUTH=htpasswd - REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm - REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd + - VIRTUAL_HOST=registry.vbchaos.nl + - VIRTUAL_PORT=5000 + - VIRTUAL_PROTO=http ports: - '5000:5000' @@ -33,6 +36,7 @@ services: - 8082:8080 environment: - 'DOCKER_REGISTRY_URL=http://maurice:5000' +# - 'DOCKER_REGISTRY_URL=https://registry.vbchaos.nl' - 'PUBLIC_REGISTRY_URL=registry.vbchaos.nl' - 'NO_SSL_VERIFICATION=true' - 'ENABLE_DELETE_IMAGES=true' diff --git a/reverseproxy/docker-compose.yml b/compose/reverseproxy/docker-compose.yml similarity index 100% rename from reverseproxy/docker-compose.yml rename to compose/reverseproxy/docker-compose.yml diff --git a/reverseproxy/init-letsencrypt.sh b/compose/reverseproxy/init-letsencrypt.sh similarity index 100% rename from reverseproxy/init-letsencrypt.sh rename to compose/reverseproxy/init-letsencrypt.sh diff --git a/tado-exporter/docker-compose.yml b/compose/tado-exporter/docker-compose.yml similarity index 82% rename from tado-exporter/docker-compose.yml rename to compose/tado-exporter/docker-compose.yml index 39b39a0..2dcac33 100644 --- a/tado-exporter/docker-compose.yml +++ b/compose/tado-exporter/docker-compose.yml @@ -5,7 +5,7 @@ services: tado-exporter: user: "1000:1000" - image: docker:5000/tado-exporter:arm64 + image: registry.vbchaos.nl/tado-exporter:arm64 hostname: tado-exporter environment: diff --git a/jenkins/Dockerfile b/create/jenkins/Dockerfile similarity index 100% rename from jenkins/Dockerfile rename to create/jenkins/Dockerfile diff --git a/rclonebackup/amd64/Dockerfile b/create/rclonebackup/amd64/Dockerfile similarity index 100% rename from rclonebackup/amd64/Dockerfile rename to create/rclonebackup/amd64/Dockerfile diff --git a/rclonebackup/amd64/docker-entrypoint.sh b/create/rclonebackup/amd64/docker-entrypoint.sh similarity index 100% rename from rclonebackup/amd64/docker-entrypoint.sh rename to create/rclonebackup/amd64/docker-entrypoint.sh diff --git a/rclonebackup/arm64/Dockerfile b/create/rclonebackup/arm64/Dockerfile similarity index 100% rename from rclonebackup/arm64/Dockerfile rename to create/rclonebackup/arm64/Dockerfile diff --git a/rclonebackup/arm64/docker-entrypoint.sh b/create/rclonebackup/arm64/docker-entrypoint.sh similarity index 100% rename from rclonebackup/arm64/docker-entrypoint.sh rename to create/rclonebackup/arm64/docker-entrypoint.sh diff --git a/rclonebackup/docker-entrypoint.sh b/create/rclonebackup/docker-entrypoint.sh similarity index 100% rename from rclonebackup/docker-entrypoint.sh rename to create/rclonebackup/docker-entrypoint.sh diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml deleted file mode 100644 index 7eac862..0000000 --- a/gitea/docker-compose.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: "3" - - -volumes: - gitea: - driver_opts: - type: nfs - o: addr=maurice,nfsvers=4 - device: :/git - -services: - server: - image: gitea/gitea:1.18.1 - environment: -# - USER_UID=1000 -# - USER_GID=1000 - - GITEA__database__DB_TYPE=mysql - - GITEA__database__HOST=db:3306 - - GITEA__database__NAME=gitea - - GITEA__database__USER=gitea - - GITEA__database__PASSWD=gitea - - volumes: -DATA - gitea:/data -REPO - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - ports: - - "3000:3000" - - "222:22" - depends_on: - - db - - db: - image: mysql:8 - restart: always - environment: - - MYSQL_ROOT_PASSWORD=gitea - - MYSQL_USER=gitea - - MYSQL_PASSWORD=gitea - - MYSQL_DATABASE=gitea - - volumes: - - ./mysql:/var/lib/mysql