From 8a599a11a4285eb15bb4f0e67bb680259f1cf080 Mon Sep 17 00:00:00 2001
From: mjanez <96422458+mjanez@users.noreply.github.com>
Date: Mon, 2 Oct 2023 07:41:25 +0000
Subject: [PATCH] Fix Dockerfiles

---
 ckan/Dockerfile      | 12 ++++++------
 ckan/Dockerfile.dev  |  4 ++--
 ckan/Dockerfile.ghcr |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index 9bf9adc5..538933b2 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -9,7 +9,7 @@ ENV TZ=UTC
 WORKDIR ${APP_DIR}
 
 # requirements.txt files fixed until next releases
-COPY req_fixes ./req_fixes
+COPY req_fixes req_fixes
 
 # Extensions
 ### XLoader - 1.0.1 ###
@@ -60,14 +60,14 @@ COPY docker-entrypoint.d/* /docker-entrypoint.d/
 COPY setup/who.ini ./
 
 # Apply any patches needed to CKAN core
-COPY patches ./
+COPY patches patches
 
 RUN for d in $APP_DIR/patches/*; do \
     if [ -d $d ]; then \
-    for f in `ls $d/*.patch | sort -g`; do \
-    cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
-    done ; \
-    fi ; \
+            for f in `ls $d/*.patch | sort -g`; do \
+                cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
+            done ; \
+        fi ; \
     done
 
 CMD ["/bin/sh", "-c", "$APP_DIR/start_ckan.sh"]
\ No newline at end of file
diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev
index 68c6ffb5..c87c3ad0 100644
--- a/ckan/Dockerfile.dev
+++ b/ckan/Dockerfile.dev
@@ -57,12 +57,12 @@ COPY docker-entrypoint.d/* docker-entrypoint.d/
 COPY setup/who.ini ./
 
 # Override start_ckan.sh with DEV sh
-COPY setup/start_ckan_development.sh.override ./start_ckan_development.sh
+COPY setup/start_ckan_development.sh.override start_ckan_development.sh
 RUN chmod +x start_ckan_development.sh
 
 # Apply any patches needed to CKAN core or any of the built extensions (not the
 # runtime mounted ones!)
-COPY patches ./
+COPY patches patches
 
 RUN for d in $APP_DIR/patches/*; do \
     if [ -d $d ]; then \
diff --git a/ckan/Dockerfile.ghcr b/ckan/Dockerfile.ghcr
index caa06ca9..899a2f11 100644
--- a/ckan/Dockerfile.ghcr
+++ b/ckan/Dockerfile.ghcr
@@ -21,7 +21,7 @@ COPY docker-entrypoint.d/* docker-entrypoint.d/
 COPY setup/who.ini ./
 
 # Apply any patches needed to CKAN core
-COPY patches ./
+COPY patches patches
 
 #  Updated version of the Dockerfile RUN command that skips applying a patch if a reversed or previously applied patch is detected
 RUN for d in $APP_DIR/patches/*; do \