Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

DCD-1313: Use a Dockerfile argument rather than sed to inject test image.

Browse Source
This commit is contained in:
Steve Smith 2021-07-14 16:39:24 +10:00
parent afb0c62f40
commit 0c7817f903
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
func-tests/confluence/Dockerfile.tmpl → func-tests/confluence/Dockerfile
View File

@ -1,4 +1,5 @@
FROM INJECT_BASE_IMAGE_HERE
ARG TEST_TARGET_IMAGE
FROM $TEST_TARGET_IMAGE
COPY confluence-home/ /var/atlassian/application-data/confluence/
RUN chown -R confluence.confluence /var/atlassian/application-data/confluence

1
func-tests/confluence/inject-license
View File

@ -3,4 +3,3 @@
CONFLUENCE_TEST_LICENSE=`echo ${CONFLUENCE_TEST_LICENSE} | tr -d '\n \t'`
sed "s~INJECT_LICENSE_HERE~${CONFLUENCE_TEST_LICENSE}~" confluence/confluence-home/confluence.cfg.xml.tmpl > confluence/confluence-home/confluence.cfg.xml
sed "s~INJECT_BASE_IMAGE_HERE~${TEST_TARGET_IMAGE}~" confluence/Dockerfile.tmpl > confluence/Dockerfile

2
func-tests/docker-compose.yml
View File

@ -18,6 +18,8 @@ services:
confluence:
build:
context: ./confluence
args:
- TEST_TARGET_IMAGE=${TEST_TARGET_IMAGE}
depends_on:
- postgresql
ports: