Update logo

.github/workflows/docker-manual.yml

@@ -0,0 +1,70 @@
+name: Build and release image manually
+
+on: workflow_dispatch
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+  TAG: ghcr.io/${{ github.repository }}:${{ github.ref_name }}
+  CONTEXT: .
+  BRANCH: ${{ github.ref_name }}
+  DOCKERFILE_PATH: /ckan
+  DOCKERFILE: Dockerfile
+
+jobs:
+  docker:
+    name: manual/build-docker-push:${{ github.ref_name }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          labels: |
+            org.opencontainers.image.documentation=https://github.com/${{ github.repository }}/blob/${{ env.BRANCH }}/README.md
+            org.opencontainers.image.version=${{ env.BRANCH }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: ${{ env.TAG }}
+          labels: ${{ steps.meta.outputs.labels }}
+          context: ${{ env.CONTEXT }}
+          file: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}
+
+      - name: Linting Dockerfile with hadolint in GH Actions
+        uses: hadolint/[email protected]
+        with:
+          dockerfile: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}
+
+      - name: Run Trivy container image vulnerability scanner
+        uses: aquasecurity/[email protected]
+        with:
+          image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BRANCH }}
+          format: sarif
+          output: trivy-results.sarif
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v2
+        if: always()
+        with:
+          sarif_file: trivy-results.sarif

.gitignore

@@ -18,4 +18,5 @@ src/*
 
 # environment
 .env
-.env.*
+.env.*
+!.env.example

README.md

@@ -1,8 +1,12 @@
+<p align="center">
+  <picture>
+    <img src="./doc/img/ckan-docker-logo.png" style="height:100px">
+  </picture>
+</p>
 <h1 align="center">CKAN Docker Compose - Open Data & GIS</h1>
 <p align="center">
 <a href="https://github.com/mjanez/ckan-docker"><img src="https://img.shields.io/badge/Docker%20CKAN-2.9.9-brightgreen" alt="ckan-spatial"></a>
 
-
 <p align="center">
     <a href="#overview">Overview</a> •
     <a href="#ckan-docker-roadmap">Branch roadmap</a> •

apache/Dockerfile

@@ -1,7 +1,7 @@
 FROM httpd:2.4-alpine
 
-ENV CKAN_PORT_HOST=5000
-ENV PYCSW_PORT_HOST=8000
+ENV CKAN_PORT=5000
+ENV PYCSW_PORT=8000
 ENV PYCSW_CONTAINER_NAME=pycsw
 ENV CKAN_CONTAINER_NAME=ckan
 ENV APACHE_PORT=80
@@ -12,8 +12,8 @@ ENV PROXY_SERVER_NAME=localhost
 
 ENV PROXY_CKAN_LOCATION=/catalog
 ENV PROXY_PYCSW_LOCATION=/csw
-ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT_HOST}
-ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT_HOST}
+ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT}
+ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT}
 
 RUN mkdir -p ${APACHE_LOG_DIR}
 

nginx/Dockerfile

@@ -1,14 +1,14 @@
 FROM nginx:stable-alpine
 
-ENV CKAN_PORT_HOST=5000
-ENV PYCSW_PORT_HOST=8000
+ENV CKAN_PORT=5000
+ENV PYCSW_PORT=8000
 ENV PYCSW_CONTAINER_NAME=pycsw
 ENV CKAN_CONTAINER_NAME=ckan
 ENV PROXY_SERVER_NAME=localhost
 ENV PROXY_CKAN_LOCATION=/catalog
 ENV PROXY_PYCSW_LOCATION=/csw
-ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT_HOST}
-ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT_HOST}
+ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT}
+ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT}
 
 ENV NGINX_PORT=80
 ENV NGINX_LOG_DIR=/var/log/nginx