Skip to content

Commit

Permalink
Merge pull request #2888 from mapfish/fix-user-rights
Browse files Browse the repository at this point in the history
Fix the created files owner
  • Loading branch information
sbrunner authored Apr 4, 2023
2 parents 35a47b6 + 3fac789 commit df71bb0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ COPY docs ./docs
RUN --mount=type=cache,target=/home/gradle/.gradle \
([ -e success ] && ( (gradle :examples:build buildDocs >> /tmp/logs 2>&1) && touch success-examples-docs)) || true

RUN chmod -R go=u /home/gradle .

FROM builder AS test-builder

RUN cat /tmp/logs && ls success success-publish success-examples-docs
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ acceptance-tests-up:
cp -r examples/geoserver-data/* /tmp/geoserver-data/
cp -r core/src/test/resources/map-data/* /tmp/geoserver-data/www/

docker-compose up -d
USER_ID=$(shell id -u):$(shell id -g) docker-compose up -d

.PHONY: acceptance-tests-run
acceptance-tests-run:
Expand Down
1 change: 1 addition & 0 deletions docker-compose.override.sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version: '2.1'
services:
builder:
image: mapfish_print_builder
user: ${USER_ID}
volumes:
- ./core:/src/core
- ./examples:/src/examples
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ services:

print:
image: mapfish_print_tester
user: ${USER_ID}
volumes:
- ./examples/src/test/resources/examples:/usr/local/tomcat/webapps/ROOT/print-apps
ports:
Expand All @@ -20,8 +21,10 @@ services:

tests:
image: mapfish_print_builder
user: ${USER_ID}
command: tail --follow /dev/null
volumes:
- ./examples/src/test/resources/examples:/src/examples/src/test/resources/examples
environment:
PRINT_YAML_MAX_ALIASES: 200
GRADLE_USER_HOME: /home/gradle/.gradle

0 comments on commit df71bb0

Please sign in to comment.