From e6614563fec26701bfa68589c323e5f5928cd9aa Mon Sep 17 00:00:00 2001 From: Brett <54408245+kowh-ai@users.noreply.github.com> Date: Thu, 13 May 2021 11:28:05 +0200 Subject: [PATCH] More updates --- .github/workflows/build.yml | 5 +++-- ckan/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c973550..87f8fdc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,8 +54,9 @@ jobs: - name: CKAN build uses: docker/build-push-action@v2 with: - context: ckan - file: ckan/Dockerfile + path: ckan + context: ./ckan + file: ./ckan/Dockerfile push: false tags: kowhai/ckan-docker-ckan:testing-only \ No newline at end of file diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 326f690..eb25e1e 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 -RUN cp -pr patches/ ${APP_DIR}/ +ADD patches ${APP_DIR}/ RUN for d in ${APP_DIR}/patches/*; do \ if [ -d $d ]; then \