More updates

.github/workflows/build.yml

@@ -22,37 +22,37 @@ jobs:
     -  name: Set up QEMU
        uses: docker/setup-qemu-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

ckan/Dockerfile.dev

@@ -26,7 +26,7 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
 # runtime mounted ones)
 # See https://github.com/okfn/docker-ckan#applying-patches
 
-COPY ./patches ${APP_DIR}/patches
+COPY patches ${APP_DIR}/patches
 
 RUN for d in ${APP_DIR}/patches/*; do \
         if [ -d $d ]; then \