From cf76132c0c10931575f2539d7d41318ce8017a3d Mon Sep 17 00:00:00 2001 From: Brodin Date: Wed, 3 Jul 2024 15:43:37 -0400 Subject: [PATCH] lots of files??? --- botc/.gitignore | 3 ++- botc/docker-compose.yml | 8 +++---- dashboard/docker-compose.yml | 2 +- {gitlab => gitea}/.env.example | 1 + gitea/.gitignore | 3 +++ gitea/docker-compose.yml | 40 ++++++++++++++++++++++++++++++++++ gitlab/.gitignore | 1 - gitlab/docker-compose.yml | 19 ---------------- nextcloud/docker-compose.yml | 2 +- 9 files changed, 51 insertions(+), 28 deletions(-) rename {gitlab => gitea}/.env.example (90%) create mode 100644 gitea/.gitignore create mode 100644 gitea/docker-compose.yml delete mode 100644 gitlab/.gitignore delete mode 100644 gitlab/docker-compose.yml diff --git a/botc/.gitignore b/botc/.gitignore index 5487749..500b7f9 100644 --- a/botc/.gitignore +++ b/botc/.gitignore @@ -1,3 +1,4 @@ backup/* wordpress/* -data/* \ No newline at end of file +data/* +db/* diff --git a/botc/docker-compose.yml b/botc/docker-compose.yml index f43651b..a85a113 100644 --- a/botc/docker-compose.yml +++ b/botc/docker-compose.yml @@ -8,7 +8,7 @@ services: MYSQL_PASSWORD: ${DBPASS} MYSQL_RANDOM_ROOT_PASSWORD: '1' volumes: - - ./db:/var/lib/mysql + - ./db:/var/lib/mysql:rw wordpress: depends_on: - db @@ -26,10 +26,8 @@ services: LETSENCRYPT_EMAIL: ${EMAIL} # LETSENCRYPT_TEST: true volumes: - - ./wordpress:/var/www/html - - ./backup:/var/www/html/wp-content/updraft -volumes: - db: + - ./wordpress:/var/www/html:rw + - ./backup:/var/www/html/wp-content/updraft:rw networks: default: name: nginx-proxy diff --git a/dashboard/docker-compose.yml b/dashboard/docker-compose.yml index d4cef3a..e3996df 100644 --- a/dashboard/docker-compose.yml +++ b/dashboard/docker-compose.yml @@ -10,7 +10,7 @@ services: - ${DATA_LOCATION}/homarr:/data environment: - VIRTUAL_HOST=homarr.${DOMAIN}, ${DOMAIN}, www.${DOMAIN} - - LETSENCRYPT_HOST="homarr.${DOMAIN}, ${DOMAIN}, www.${DOMAIN}" + - LETSENCRYPT_HOST=${DOMAIN} - LETSENCRYPT_EMAIL=${EMAIL} expose: - "7575" diff --git a/gitlab/.env.example b/gitea/.env.example similarity index 90% rename from gitlab/.env.example rename to gitea/.env.example index 604cbf5..85f629d 100644 --- a/gitlab/.env.example +++ b/gitea/.env.example @@ -1,6 +1,7 @@ DOMAIN=example.com UID=1000 GID=1000 +DBPASS=gitea TZ=Etc/UTC CONFIG_LOCATION=./config DATA_LOCATION=./data diff --git a/gitea/.gitignore b/gitea/.gitignore new file mode 100644 index 0000000..8b64bda --- /dev/null +++ b/gitea/.gitignore @@ -0,0 +1,3 @@ +config/* +data/* +db/* diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml new file mode 100644 index 0000000..417b26d --- /dev/null +++ b/gitea/docker-compose.yml @@ -0,0 +1,40 @@ +services: + server: + image: gitea/gitea:latest-rootless + container_name: gitea + depends_on: + - db + environment: + - GITEA__database__DB_TYPE=postgres + - GITEA__database__HOST=gitea-db-1:5432 + - GITEA__database__NAME=gitea + - GITEA__database__USER=gitea + - GITEA__database__PASSWD=${DBPASS} + - VIRTUAL_HOST=git.${DOMAIN},git.${DOMAIN} + - VIRTUAL_PORT=3000 + - LETSENCRYPT_HOST=git.${DOMAIN},git.${DOMAIN} + - LETSENCRYPT_EMAIL=${EMAIL} + restart: always + volumes: + - ./data:/var/lib/gitea + - ./config:/etc/gitea + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + ports: + - "3000:3000" + - "2222:2222" + expose: + - "3000" + db: + image: postgres:14 + restart: always + environment: + - POSTGRES_USER=gitea + - POSTGRES_PASSWORD=${DBPASS} + - POSTGRES_DB=gitea + volumes: + - ./db:/var/lib/postgresql/data +networks: + default: + name: nginx-proxy + external: true diff --git a/gitlab/.gitignore b/gitlab/.gitignore deleted file mode 100644 index adbb97d..0000000 --- a/gitlab/.gitignore +++ /dev/null @@ -1 +0,0 @@ -data/ \ No newline at end of file diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml deleted file mode 100644 index c181d6b..0000000 --- a/gitlab/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -services: - gitlab: - image: gitlab/gitlab-ee:16.9.6-ee.0 - container_name: gitlab - restart: always - hostname: 'gitlab.${DOMAIN}' - environment: - - VIRTUAL_HOST=gitlab.${DOMAIN} - - LETSENCRYPT_HOST=gitlab.${DOMAIN} - - LETSENCRYPT_EMAIL=${EMAIL} - volumes: - - '${CONFIG_LOCATION}/gitlab:/etc/gitlab' - - '${CONFIG_LOCATION}/logs:/var/log/gitlab' - - '${DATA_LOCATION}/data:/var/opt/gitlab' - shm_size: '256m' -networks: - default: - name: nginx-proxy - external: true diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index d40d1ec..13e8362 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -27,7 +27,7 @@ services: environment: TZ: "${TZ}" VIRTUAL_HOST: "nextcloud.${DOMAIN}" - MYSQL_HOST: db + MYSQL_HOST: gitea-db-1 MYSQL_DATABASE: nextcloud MYSQL_USER: nextcloud MYSQL_PASSWORD: ${DBPASS}