From 2d189be138245615cf372b751d373878d69a478f Mon Sep 17 00:00:00 2001 From: Brett <54408245+kowh-ai@users.noreply.github.com> Date: Thu, 13 May 2021 11:13:03 +0200 Subject: [PATCH] Update --- .github/workflows/build.yml | 1 + ckan/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6e1554..c973550 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,6 +54,7 @@ jobs: - name: CKAN build uses: docker/build-push-action@v2 with: + context: ckan file: ckan/Dockerfile push: false tags: kowhai/ckan-docker-ckan:testing-only diff --git a/ckan/Dockerfile b/ckan/Dockerfile index eb25e1e..326f690 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -27,7 +27,7 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \ # runtime mounted ones) # See https://github.com/okfn/docker-ckan#applying-patches -ADD patches ${APP_DIR}/ +RUN cp -pr patches/ ${APP_DIR}/ RUN for d in ${APP_DIR}/patches/*; do \ if [ -d $d ]; then \