diff --git a/.env.sample b/.env.sample index 53183a1..d2c14c9 100644 --- a/.env.sample +++ b/.env.sample @@ -34,13 +34,6 @@ USERSHUB_HOST="${HOST}" USERSHUB_HOSTPORT="${HOSTPORT}" USERSHUB_PREFIX="/usershub" -TAXHUB_IMAGE="ghcr.io/pnx-si/taxhub:latest" -TAXHUB_PROTOCOL="${BASE_PROTOCOL}" -TAXHUB_HOST="${HOST}" -TAXHUB_HOSTPORT="${HOSTPORT}" -TAXHUB_PREFIX="/taxhub" -TAXHUB_API_PREFIX="${TAXHUB_PREFIX}/api" - GEONATURE_BACKEND_EXTRA_IMAGE="ghcr.io/pnx-si/geonature-backend-extra:latest" GEONATURE_BACKEND_PROTOCOL="${BASE_PROTOCOL}" GEONATURE_BACKEND_HOST="${HOST}" diff --git a/.gitmodules b/.gitmodules index 1b74a71..368990f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,24 +1,19 @@ [submodule "GeoNature"] path = sources/GeoNature - url = https://github.com/PnX-SI/GeoNature.git - branch = feat/docker-action -[submodule "TaxHub"] - path = sources/TaxHub - url = https://github.com/PnX-SI/TaxHub.git - branch = develop + url = ../GeoNature.git [submodule "UsersHub"] path = sources/UsersHub - url = https://github.com/PnX-SI/UsersHub.git + url = ../UsersHub.git branch = develop [submodule "gn_module_export"] path = sources/gn_module_export - url = https://github.com/PnX-SI/gn_module_export.git + url = ../gn_module_export.git [submodule "gn_module_import"] path = sources/gn_module_import - url = https://github.com/PnX-SI/gn_module_import.git + url = ../gn_module_import.git [submodule "gn_module_dashboard"] path = sources/gn_module_dashboard - url = https://github.com/PnX-SI/gn_module_dashboard.git + url = ../gn_module_dashboard.git [submodule "gn_module_monitoring"] path = sources/gn_module_monitoring - url = https://github.com/PnX-SI/gn_module_monitoring + url = ../gn_module_monitoring diff --git a/docker-compose.yml b/docker-compose.yml index 6882391..833a13d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,6 @@ x-geonature-backend-env: &geonature-backend-env GEONATURE_SQLALCHEMY_DATABASE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT:-5432}/${POSTGRES_DB} GEONATURE_URL_APPLICATION: ${GEONATURE_FRONTEND_PROTOCOL}://${GEONATURE_FRONTEND_HOSTPORT}${GEONATURE_FRONTEND_PREFIX} GEONATURE_API_ENDPOINT: ${GEONATURE_BACKEND_PROTOCOL}://${GEONATURE_BACKEND_HOSTPORT}${GEONATURE_BACKEND_PREFIX} - GEONATURE_API_TAXHUB: ${TAXHUB_PROTOCOL}://${TAXHUB_HOSTPORT}${TAXHUB_API_PREFIX} GEONATURE_CONFIG_FILE: ${GEONATURE_CONFIG_FILE:-/dist/config/geonature_config.toml} GEONATURE_CELERY__broker_url: ${GEONATURE_CELERY__broker_url:-redis://redis} GEONATURE_CELERY__result_backend: ${GEONATURE_CELERY__result_backend:-redis://redis} @@ -114,32 +113,6 @@ services: - "traefik.http.routers.usershub.entrypoints=websecure" - "traefik.http.routers.usershub.tls.certResolver=acme-resolver" - taxhub: - <<: [*restart-policy,*defaults] - image: ${TAXHUB_IMAGE} - depends_on: - postgres: - condition: service_healthy - geonature-install-db: - condition: service_completed_successfully - volumes: - - ./config/taxhub:/dist/config - - ./data/taxhub/medias:${TAXHUB_STATIC_FOLDER:-/dist/static}/medias - environment: - <<: *env-defaults - TAXHUB_APPLICATION_ROOT: "${TAXHUB_PREFIX}" - TAXHUB_SQLALCHEMY_DATABASE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT:-5432}/${POSTGRES_DB} - TAXHUB_SETTINGS: ${TAXHUB_SETTINGS:-/dist/config/config.py} - TAXHUB_UPLOAD_FOLDER: "medias" - TAXHUB_SQLALCHEMY_TRACK_MODIFICATIONS: False - TAXHUB_COOKIE_EXPIRATION: 3600 - TAXHUB_PASS_METHOD: "hash" - labels: - - "traefik.enable=true" - - "traefik.http.routers.taxhub.rule=Host(`${TAXHUB_HOST}`) && PathPrefix(`${TAXHUB_PREFIX}`)" - - "traefik.http.routers.taxhub.entrypoints=websecure" - - "traefik.http.routers.taxhub.tls.certResolver=acme-resolver" - geonature-install-db: <<: *geonature-backend-defaults command: "geonature permissions supergrant --yes ${GEONATURE_SUPERGRANT_ARGS:---help}" diff --git a/init-config.sh b/init-config.sh index f897190..bc2421a 100755 --- a/init-config.sh +++ b/init-config.sh @@ -5,7 +5,4 @@ if [ ! -f config/geonature/geonature_config.toml ]; then fi if [ ! -f config/usershub/config.py ]; then echo SECRET_KEY = \"$(openssl rand -hex 16)\" > config/usershub/config.py -fi -if [ ! -f config/taxhub/config.py ]; then - echo SECRET_KEY = \"$(openssl rand -hex 16)\" > config/taxhub/config.py -fi +fi \ No newline at end of file diff --git a/sources/TaxHub b/sources/TaxHub deleted file mode 160000 index 14614a7..0000000 --- a/sources/TaxHub +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14614a75ad80a09f6a0fcfddda54252340abf728