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

Merged in CLIP-1906-fix-volume-declaration (pull request #173)

Browse Source 
CLIP-1906: Fix volume comment in the Dockerfile

* CLIP-1906: Fix volume comment in the Dockerfile

* Fix netcat package name


Approved-by: Yifei Zhang
This commit is contained in:
Eugene Ivantsov 2024-07-23 23:41:51 +00:00
parent 2601be3f18
commit 4739fca3c6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -63,7 +63,8 @@ RUN groupadd --gid ${RUN_GID} ${RUN_GROUP} \
&& mkdir -p /opt/java/openjdk/lib/fonts/fallback/ \ && mkdir -p /opt/java/openjdk/lib/fonts/fallback/ \
&& ln -sf /usr/share/fonts/truetype/noto/* /opt/java/openjdk/lib/fonts/fallback/ && ln -sf /usr/share/fonts/truetype/noto/* /opt/java/openjdk/lib/fonts/fallback/
VOLUME ["${CONFLUENCE_HOME}"] # Must be declared after setting perms # Must be declared after setting perms
VOLUME ["${CONFLUENCE_HOME}"]
CMD ["/entrypoint.py"] CMD ["/entrypoint.py"]
ENTRYPOINT ["/usr/bin/tini", "--"] ENTRYPOINT ["/usr/bin/tini", "--"]

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

@ -26,7 +26,7 @@ services:
- '8090:8090' - '8090:8090'
entrypoint: ["/bin/bash", "-c"] entrypoint: ["/bin/bash", "-c"]
command: > command: >
'command -v microdnf &> /dev/null && microdnf install -y nmap || { apt-get update -y && apt-get install -y netcat; } && 'command -v microdnf &> /dev/null && microdnf install -y nmap || { apt-get update -y && apt-get install -y netcat-traditional; } &&
/opt/atlassian/support/waitport postgresql 5432 && /opt/atlassian/support/waitport postgresql 5432 &&
chown -R confluence.confluence /var/atlassian/application-data/confluence/ && chown -R confluence.confluence /var/atlassian/application-data/confluence/ &&
/entrypoint.py' /entrypoint.py'