File tree 2 files changed +29
-4
lines changed
2 files changed +29
-4
lines changed Original file line number Diff line number Diff line change 15
15
16
16
.PHONY : acceptance-tests-up
17
17
acceptance-tests-up :
18
- docker- compose down --remove-orphan
18
+ docker compose down
19
19
20
20
mkdir /tmp/geoserver-data || true
21
21
docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver:2.17 \
@@ -24,17 +24,17 @@ acceptance-tests-up:
24
24
cp -r examples/geoserver-data/* /tmp/geoserver-data/
25
25
cp -r core/src/test/resources/map-data/* /tmp/geoserver-data/www/
26
26
27
- docker- compose up -d
27
+ docker compose up -d
28
28
29
29
.PHONY : acceptance-tests-run
30
30
acceptance-tests-run :
31
- docker- compose exec -T tests gradle :examples:integrationTest
31
+ docker compose exec -T tests gradle :examples:integrationTest
32
32
ci/check-fonts
33
33
ci/validate-container
34
34
35
35
.PHONY : acceptance-tests-down
36
36
acceptance-tests-down :
37
- docker- compose down || true
37
+ docker compose down || true
38
38
docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
39
39
bash -c ' rm -rf /mnt/geoserver_datadir/*'
40
40
rmdir /tmp/geoserver-data
Original file line number Diff line number Diff line change @@ -19,6 +19,31 @@ services:
19
19
JASPER_LOG_LEVEL : DEBUG
20
20
CATALINA_OUT : /dev/stdout
21
21
22
+ db :
23
+ image : camptocamp/postgres:14-postgis-3
24
+ environment :
25
+ - POSTGRES_PASSWORD=pgpass
26
+ - POSTGRES_DB=print
27
+ - POSTGRES_USER=print
28
+
29
+ printclusternode1 : &printclusternode
30
+ image : mapfish_print_tester
31
+ volumes :
32
+ - ./examples/src/test/resources/examples:/usr/local/tomcat/webapps/ROOT/print-apps
33
+ ports :
34
+ - 8081:8080
35
+ environment :
36
+ PRINT_YAML_MAX_ALIASES : 200
37
+ LOG_LEVEL : DEBUG
38
+ JASPER_LOG_LEVEL : DEBUG
39
+ CATALINA_OUT : /dev/stdout
40
+ CATALINA_OPTS : -Ddb.host=db -Ddb.port=$(PGPORT) -Ddb.username=print -Ddb.password=pgpass -Ddb.name=print -Ddb.schema=public
41
+
42
+ printclusternode2 :
43
+ << : *printclusternode
44
+ ports :
45
+ - 8082:8080
46
+
22
47
tests :
23
48
image : mapfish_print_builder
24
49
command : sleep infinity
You can’t perform that action at this time.
0 commit comments