More updates

This commit is contained in:
Brett 2021-05-13 10:09:15 +02:00
parent 8ecc45d60e
commit 565517ae40
3 changed files with 30 additions and 30 deletions

View File

@ -19,37 +19,37 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
- name: NGINX build #- name: NGINX build
uses: docker/build-push-action@v2 # uses: docker/build-push-action@v2
with: # with:
context: nginx # context: nginx
file: nginx/Dockerfile # file: nginx/Dockerfile
push: false # push: false
tags: kowhai/ckan-docker-nginx:testing-only # tags: kowhai/ckan-docker-nginx:testing-only
- name: PostgreSQL build #- name: PostgreSQL build
uses: docker/build-push-action@v2 # uses: docker/build-push-action@v2
with: # with:
context: postgresql # context: postgresql
file: postgresql/Dockerfile # file: postgresql/Dockerfile
push: false # push: false
tags: kowhai/ckan-docker-postgresql:testing-only # tags: kowhai/ckan-docker-postgresql:testing-only
- name: Solr build #- name: Solr build
uses: docker/build-push-action@v2 # uses: docker/build-push-action@v2
with: # with:
context: solr # context: solr
file: solr/Dockerfile # file: solr/Dockerfile
push: false # push: false
tags: kowhai/ckan-docker-solr:testing-only # tags: kowhai/ckan-docker-solr:testing-only
- name: DataPusher build #- name: DataPusher build
uses: docker/build-push-action@v2 # uses: docker/build-push-action@v2
with: # with:
context: datapusher # context: datapusher
file: datapusher/Dockerfile # file: datapusher/Dockerfile
push: false # push: false
tags: kowhai/ckan-docker-datapusher:testing-only # tags: kowhai/ckan-docker-datapusher:testing-only
- name: CKAN build - name: CKAN build
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2

View File

@ -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 # Apply any patches needed to CKAN core or any of the built extensions (not the
# runtime mounted ones) # runtime mounted ones)
# See https://github.com/okfn/docker-ckan#applying-patches # 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 \ RUN for d in ${APP_DIR}/patches/*; do \
if [ -d $d ]; then \ if [ -d $d ]; then \

View File

@ -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 # Apply any patches needed to CKAN core or any of the built extensions (not the
# runtime mounted ones) # runtime mounted ones)
# See https://github.com/okfn/docker-ckan#applying-patches # 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 \ RUN for d in ${APP_DIR}/patches/*; do \
if [ -d $d ]; then \ if [ -d $d ]; then \