Merge pull request #1079 from camptocamp/backport/1078-to-prod-2-8-ad…

…vance

[Backport prod-2-8-advance] Fix acceptences local

.github/workflows/main.yaml

@@ -34,8 +34,7 @@ jobs:
       - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
       - run: python3 -m pip install --user --requirement=ci/requirements.txt
 
-      - run: cp env.acceptance-test env.secrets
-      - run: sed -i '/^DOCKER_TAG=/d' env.project
+      - run: touch env.secrets
 
       - name: Checks
         run: c2cciutils-checks

Makefile

@@ -61,13 +61,15 @@ secrets: ## Decrypt the secrets.tar.bz2.gpg file
 
 .PHONY: acceptance-init
 acceptance-init: ## Initialize the acceptance tests
+	cat env.acceptance-test >> .env
+	docker volume rm demo_postgresql_data || true
 	docker-compose --file=docker-compose.yaml --file=docker-compose-db.yaml up -d db tools
 	docker-compose exec -T tools wait-db
 	docker-compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS postgis'
 	docker-compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS pg_trgm'
 	docker-compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS hstore'
 	scripts/db-restore --docker-compose-file=docker-compose.yaml --docker-compose-file=docker-compose-db.yaml \
-		--arg=--clean --arg=--if-exists --arg=--verbose $(DUMP_FILE)
+		--arg=--clean --arg=--if-exists --arg=--verbose --arg=--no-privileges --arg=--no-owner $(DUMP_FILE)
 	docker-compose --file=docker-compose.yaml --file=docker-compose-db.yaml up -d
 
 .PHONY: acceptance

env.project

@@ -1,7 +1,6 @@
 # Custom project values
 COMPOSE_PROJECT_NAME=demo
 DOCKER_BASE=camptocamp/geomapfishdemo
-DOCKER_TAG=2.8
 
 PGHOST=pg-gs.camptocamp.com
 PGHOST_SLAVE=pg-gs.camptocamp.com

geoportal/vars.yaml

@@ -970,4 +970,3 @@ runtime_environment:
 
 environment:
   - name: VERSION
-  - name: PGSCHEMA