diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72fad32..e6e1554 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,8 +54,7 @@ jobs: - name: CKAN build uses: docker/build-push-action@v2 with: - context: ./ckan - file: ./ckan/Dockerfile + 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 135c884..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 -ADD ckan/patches ${APP_DIR}/ +ADD patches ${APP_DIR}/ RUN for d in ${APP_DIR}/patches/*; do \ if [ -d $d ]; then \ diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index 9c0ead5..c4c5758 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -25,7 +25,7 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \ # Apply any patches needed to CKAN core or any of the built extensions (not the # runtime mounted ones) # See https://github.com/okfn/docker-ckan#applying-patches -ADD ckan/patches ${APP_DIR}/ +ADD patches ${APP_DIR}/ RUN for d in ${APP_DIR}/patches/*; do \ if [ -d $d ]; then \