File tree 2 files changed +27
-7
lines changed
2 files changed +27
-7
lines changed Original file line number Diff line number Diff line change @@ -64,17 +64,12 @@ acceptance-tests-run: .env
64
64
.PHONY : acceptance-tests-down
65
65
acceptance-tests-down : .env
66
66
docker compose down || true
67
+ acceptance-tests-down :
68
+ docker compose down || true
67
69
docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
68
70
bash -c ' rm -rf /mnt/geoserver_datadir/*'
69
71
rmdir /tmp/geoserver-data
70
72
71
73
.PHONY : dist
72
- dist : build-builder
73
- mkdir --parent core/build
74
- rm -rf core/build/libs core/build/distributions
75
- docker run --rm --user=$(shell id -u) :$(shell id -g) \
76
- --volume=$(PWD ) /core/build:/src/core/build2/:rw mapfish_print_builder \
77
- cp -r /src/core/build/libs /src/core/build/distributions /src/core/build2/
78
-
79
74
.env :
80
75
echo " USER_ID=$( shell id -u) :$( shell id -g) " > $@
Original file line number Diff line number Diff line change @@ -17,6 +17,31 @@ services:
17
17
LOG_LEVEL : DEBUG
18
18
JASPER_LOG_LEVEL : DEBUG
19
19
20
+ db :
21
+ image : camptocamp/postgres:14-postgis-3
22
+ environment :
23
+ - POSTGRES_PASSWORD=pgpass
24
+ - POSTGRES_DB=print
25
+ - POSTGRES_USER=print
26
+
27
+ printclusternode1 : &printclusternode
28
+ image : mapfish_print_tester
29
+ volumes :
30
+ - ./examples/src/test/resources/examples:/usr/local/tomcat/webapps/ROOT/print-apps
31
+ ports :
32
+ - 8081:8080
33
+ environment :
34
+ PRINT_YAML_MAX_ALIASES : 200
35
+ LOG_LEVEL : DEBUG
36
+ JASPER_LOG_LEVEL : DEBUG
37
+ CATALINA_OUT : /dev/stdout
38
+ CATALINA_OPTS : -Ddb.host=db -Ddb.port=5432 -Ddb.username=print -Ddb.password=pgpass -Ddb.name=print -Ddb.schema=public
39
+
40
+ printclusternode2 :
41
+ << : *printclusternode
42
+ ports :
43
+ - 8082:8080
44
+
20
45
tests :
21
46
image : mapfish_print_builder
22
47
user : ${USER_ID}
You can’t perform that action at this time.
0 commit comments