From 45d4bb6f775e75e56eaf79380776a3019b816e31 Mon Sep 17 00:00:00 2001 From: ryuupendragon Date: Mon, 7 Jul 2025 11:56:01 +0530 Subject: [PATCH] Update Opengist for Postgres --- opengist/docker-compose-mariadb.yml | 47 +++++++++++++++++++++++++++++ opengist/docker-compose.yml | 18 +++++------ 2 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 opengist/docker-compose-mariadb.yml diff --git a/opengist/docker-compose-mariadb.yml b/opengist/docker-compose-mariadb.yml new file mode 100644 index 0000000..0e3cf21 --- /dev/null +++ b/opengist/docker-compose-mariadb.yml @@ -0,0 +1,47 @@ +services: + opengist_db: + image: docker.io/library/mariadb:11.8.2 + container_name: opengist_db + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + volumes: + - ${APPDATA_PATH}/opengist/db:/var/lib/mysql + ports: + - ${DB_PORT}:3306 + restart: unless-stopped + healthcheck: + test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] + start_period: 10s + interval: 10s + timeout: 5s + retries: 3 + + opengist_server: + image: ghcr.io/thomiceli/opengist:1.10.0 + container_name: opengist_server + depends_on: + opengist_db: + condition: service_healthy + environment: + - UID=${UID} + - GID=${GID} + - OG_DB_URI=mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@opengist_db:3306/${MYSQL_DATABASE} + - OG_EXTERNAL_URL=${OG_EXTERNAL_URL} + - OG_SECRET_KEY=${OG_SECRET_KEY} + - OG_HTTP_GIT_ENABLED=${OG_HTTP_GIT_ENABLED} + - OG_SSH_GIT_ENABLED=${OG_SSH_GIT_ENABLED} + - OG_GITEA_CLIENT_KEY=${OG_GITEA_CLIENT_KEY} + - OG_GITEA_SECRET=${OG_GITEA_SECRET} + - OG_GITEA_URL=${OG_GITEA_URL} + - OG_GITEA_NAME=${OG_GITEA_NAME} + - OG_CUSTOM_STATIC_LINK_0_NAME=${OG_CUSTOM_STATIC_LINK_0_NAME} + - OG_CUSTOM_STATIC_LINK_0_PATH=${OG_CUSTOM_STATIC_LINK_0_PATH} + volumes: + - ${APPDATA_PATH}/opengist/data:/opengist + ports: + - ${SERVER_PORT}:6157 + restart: unless-stopped diff --git a/opengist/docker-compose.yml b/opengist/docker-compose.yml index 0e3cf21..729e5b0 100644 --- a/opengist/docker-compose.yml +++ b/opengist/docker-compose.yml @@ -1,20 +1,18 @@ services: opengist_db: - image: docker.io/library/mariadb:11.8.2 + image: docker.io/library/postgres:17.5 container_name: opengist_db - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed environment: - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - - MYSQL_USER=${MYSQL_USER} - - MYSQL_PASSWORD=${MYSQL_PASSWORD} - - MYSQL_DATABASE=${MYSQL_DATABASE} + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_DB=${POSTGRES_DB} volumes: - - ${APPDATA_PATH}/opengist/db:/var/lib/mysql + - ${APPDATA_PATH}/opengist/db:/var/lib/postgresql/data ports: - - ${DB_PORT}:3306 + - ${DB_PORT}:5432 restart: unless-stopped healthcheck: - test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] + test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}"] start_period: 10s interval: 10s timeout: 5s @@ -29,7 +27,7 @@ services: environment: - UID=${UID} - GID=${GID} - - OG_DB_URI=mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@opengist_db:3306/${MYSQL_DATABASE} + - OG_DB_URI=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@opengist_db:5432/${POSTGRES_DB} - OG_EXTERNAL_URL=${OG_EXTERNAL_URL} - OG_SECRET_KEY=${OG_SECRET_KEY} - OG_HTTP_GIT_ENABLED=${OG_HTTP_GIT_ENABLED}