From 565517ae40d03b1239e83a091acf0a92de30373e Mon Sep 17 00:00:00 2001 From: Brett <54408245+kowh-ai@users.noreply.github.com> Date: Thu, 13 May 2021 10:09:15 +0200 Subject: [PATCH] More updates --- .github/workflows/build.yml | 56 ++++++++++++++++++------------------- ckan/Dockerfile | 2 +- ckan/Dockerfile.dev | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ecf7a9..c973550 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,37 +19,37 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: NGINX build - uses: docker/build-push-action@v2 - with: - context: nginx - file: nginx/Dockerfile - push: false - tags: kowhai/ckan-docker-nginx:testing-only + #- name: NGINX build + # uses: docker/build-push-action@v2 + # with: + # context: nginx + # file: nginx/Dockerfile + # push: false + # tags: kowhai/ckan-docker-nginx:testing-only - - name: PostgreSQL build - uses: docker/build-push-action@v2 - with: - context: postgresql - file: postgresql/Dockerfile - push: false - tags: kowhai/ckan-docker-postgresql:testing-only + #- name: PostgreSQL build + # uses: docker/build-push-action@v2 + # with: + # context: postgresql + # file: postgresql/Dockerfile + # push: false + # tags: kowhai/ckan-docker-postgresql:testing-only - - name: Solr build - uses: docker/build-push-action@v2 - with: - context: solr - file: solr/Dockerfile - push: false - tags: kowhai/ckan-docker-solr:testing-only + #- name: Solr build + # uses: docker/build-push-action@v2 + # with: + # context: solr + # file: solr/Dockerfile + # push: false + # tags: kowhai/ckan-docker-solr:testing-only - - name: DataPusher build - uses: docker/build-push-action@v2 - with: - context: datapusher - file: datapusher/Dockerfile - push: false - tags: kowhai/ckan-docker-datapusher:testing-only + #- name: DataPusher build + # uses: docker/build-push-action@v2 + # with: + # context: datapusher + # file: datapusher/Dockerfile + # push: false + # tags: kowhai/ckan-docker-datapusher:testing-only - name: CKAN build uses: docker/build-push-action@v2 diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 66317f7..5b87441 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -26,7 +26,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 -COPY 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 f3ab3f1..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 -COPY patches ${APP_DIR}/ +ADD patches ${APP_DIR}/ RUN for d in ${APP_DIR}/patches/*; do \ if [ -d $d ]; then \