From 4739fca3c62b8f684203d106992b06d06654046a Mon Sep 17 00:00:00 2001
From: Eugene Ivantsov <yivantsov@atlassian.com>
Date: Tue, 23 Jul 2024 23:41:51 +0000
Subject: [PATCH] Merged in CLIP-1906-fix-volume-declaration (pull request
 #173)

CLIP-1906: Fix volume comment in the Dockerfile

* CLIP-1906: Fix volume comment in the Dockerfile

* Fix netcat package name


Approved-by: Yifei Zhang
---
 Dockerfile                    | 3 ++-
 func-tests/docker-compose.yml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2ce0cb8..d879973 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,7 +63,8 @@ RUN groupadd --gid ${RUN_GID} ${RUN_GROUP} \
     && mkdir -p /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"]
 ENTRYPOINT ["/usr/bin/tini", "--"]
diff --git a/func-tests/docker-compose.yml b/func-tests/docker-compose.yml
index 883d305..48b82cc 100644
--- a/func-tests/docker-compose.yml
+++ b/func-tests/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - '8090:8090'
     entrypoint: ["/bin/bash", "-c"]
     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 &&
       chown -R confluence.confluence  /var/atlassian/application-data/confluence/ &&
       /entrypoint.py'