Update from base branch

From the artifact of the previous workflow run

.dockerignore

@@ -12,7 +12,6 @@
 !geoportal/geomapfish_geoportal/static
 !geoportal/geomapfish_geoportal/locale
 geoportal/geomapfish_geoportal/locale/*.pot
-<<<<<<< ours
 !webcomponents
 !package.json
 !package-lock.json
@@ -22,8 +21,3 @@ geoportal/geomapfish_geoportal/locale/*.pot
 ui/dist/
 ui/node_modules/
 ui/static/fa-*
-=======
-!geoportal/geomapfish_geoportal/authentication.py
-!geoportal/geomapfish_geoportal/multi_tenant.py
-!geoportal/geomapfish_geoportal/dev.py
->>>>>>> theirs

Dockerfile

@@ -28,7 +28,6 @@ ENV PGSCHEMA=$PGSCHEMA
 
 RUN \
     cd /tmp/config/geoportal/ \
-    && [ "${SIMPLE}" == "TRUE" ] || rm -f geomapfish_geoportal/*.py \
     && c2c-template --vars ${VARS_FILE} \
         --get-config geomapfish_geoportal/config.yaml \
         ${CONFIG_VARS} \

Makefile

@@ -1,10 +1,5 @@
-<<<<<<< ours
 PROJECT_PUBLIC_URL=https://geomapfish-demo-2-9.camptocamp.com/
 DUMP_FILE=data/prod-2-7.dump
-=======
-PROJECT_PUBLIC_URL?=https://example.camptocamp.com/
-DUMP_FILE=dump.backup
->>>>>>> theirs
 PACKAGE=geomapfish
 LANGUAGES=en fr de it
 
@@ -18,10 +13,10 @@ help: ## Display this help message
 
 .PHONY: update-po-from-url
 update-po-from-url: ## Update the po files from the URL provide by PROJECT_PUBLIC_URL
-	curl ${CURL_ARGS} --fail --retry 5 --retry-delay 1 \
+	curl --fail --retry 5 --retry-delay 1 \
 		$(PROJECT_PUBLIC_URL)locale.pot > geoportal/${PACKAGE}_geoportal/locale/${PACKAGE}_geoportal-client${SUFFIX}.pot
 	sed -i '/^"POT-Creation-Date: /d' geoportal/${PACKAGE}_geoportal/locale/${PACKAGE}_geoportal-client${SUFFIX}.pot
-	docker compose run --rm -T --env=SUFFIX=${SUFFIX} tools update-po-only `id --user` `id --group` $(LANGUAGES)
+	docker compose run --rm -T tools update-po-only `id --user` `id --group` $(LANGUAGES)
 
 .PHONY: update-po
 update-po: ## Update the po files from the running composition

env.default

@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.48
+GEOMAPFISH_VERSION=2.9.rc.47
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish

env.project

@@ -71,7 +71,6 @@ C2C_AUTH_GITHUB_SCOPE=repo
 C2C_AUTH_GITHUB_PROXY_URL=https://geoservicies.camptocamp.com/redirect
 C2C_USE_SESSION=true
 
-<<<<<<< ours
 C2C_LOG_VIEW_ENABLED=TRUE
 C2C_SQL_PROFILER_ENABLED=TRUE
 C2C_DEBUG_VIEW_ENABLED=TRUE
@@ -88,7 +87,3 @@ BASICAUTH=True
 # Custom Swisscom heatmap plugin
 SWISSCOM_CLIENT_ID=setme
 SWISSCOM_CLIENT_SECRET=setme
-=======
-# For multi-tenant
-DEFAULT_PREFIX=unknown
->>>>>>> theirs