From 2d21872dde8ae3219538a5b0d00dbf1071cc053e Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 23 Apr 2023 09:51:38 +0300
Subject: [PATCH] Resolved #9207 - Dockerfile update for new location

---
 Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c9153f0485..2ce315eeaa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
-
 ARG ARG_COMPILE_BASE_IMAGE=accetto/ubuntu-vnc-xfce-opengl-g3
 FROM $ARG_COMPILE_BASE_IMAGE as build
 USER root
@@ -11,7 +10,7 @@ RUN wget -q -O packr-all-4.0.0.jar https://github.com/libgdx/packr/releases/down
     wget -q -O jre-linux-64.tar.gz https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz
 
 # https://nieldw.medium.com/caching-gradle-binaries-in-a-docker-build-when-using-the-gradle-wrapper-277c17e7dd22
-# Get gradle distribution 
+# Get gradle distribution
 COPY *.gradle gradle.* gradlew /src/
 COPY gradle /src/gradle
 WORKDIR /src
@@ -25,8 +24,8 @@ RUN ./gradlew desktop:zipLinuxFilesForJar
 
 FROM accetto/ubuntu-vnc-xfce-opengl-g3 as run
 WORKDIR /home/headless/Desktop/
-COPY --chown=1001:1001 --from=build /src/desktop/packr/* /usr/
-COPY --chown=1001:1001 --from=build /src/desktop/packr/Unciv.jar /usr/share/Unciv/Unciv.jar
-COPY --chown=1001:1001 --from=build /src/desktop/linuxFilesForJar/* /home/headless/Desktop/
+COPY --chown=1001:1001 --from=build /src/deploy/* /usr/
+COPY --chown=1001:1001 --from=build /src/deploy/Unciv.jar /usr/share/Unciv/Unciv.jar
+COPY --chown=1001:1001 --from=build /src/deploy/linuxFilesForJar/* /home/headless/Desktop/
 RUN chmod +x Unciv.sh
-USER 1001
\ No newline at end of file
+USER 1001