From b2d80d2267d604a27bbca96aa0ff0dbeb50e38de Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Tue, 13 Aug 2019 11:22:30 +1000
Subject: [PATCH] DCD-558: Move script/template copy to the end to avoid
 downloads during dev.

---
 Dockerfile        | 8 ++++----
 Dockerfile-alpine | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4040185..dd0b120 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,10 +28,6 @@ ARG TINI_VERSION=v0.18.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
 RUN chmod +x /sbin/tini
 
-COPY entrypoint.py              			/entrypoint.py
-COPY scripts/*						/opt/atlassian/bin/
-COPY config/*						/opt/atlassian/etc/
-
 ARG CONFLUENCE_VERSION
 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
 
@@ -47,3 +43,7 @@ RUN groupadd --gid ${RUN_GID} ${RUN_GROUP} \
     && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/work \
     \
     && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh
+
+COPY entrypoint.py              			/entrypoint.py
+COPY scripts/*						/opt/atlassian/bin/
+COPY config/*						/opt/atlassian/etc/
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index 0bc350e..7d265c8 100644
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -28,10 +28,6 @@ RUN ln -s /usr/lib/libfontconfig.so.1 /usr/lib/libfontconfig.so \
     && ln -s /lib/libc.musl-x86_64.so.1 /usr/lib/libc.musl-x86_64.so.1
 ENV LD_LIBRARY_PATH /usr/lib
 
-COPY entrypoint.py              			/entrypoint.py
-COPY scripts/*						/opt/atlassian/bin/
-COPY config/*						/opt/atlassian/etc/
-
 ARG CONFLUENCE_VERSION
 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
 
@@ -47,3 +43,7 @@ RUN addgroup -g ${RUN_GID} ${RUN_GROUP} \
     && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/work \
     \
     && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh
+
+COPY entrypoint.py              			/entrypoint.py
+COPY scripts/*						/opt/atlassian/bin/
+COPY config/*						/opt/atlassian/etc/