CatalogueRevamping
/
docker-ckan
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #128 from keitaroinc/new-release 

new release ckan-2.9.11 & ckan-2.10.4
This commit is contained in:
stojanovskis1 2024-03-13 15:09:21 +01:00 committed by GitHub
parent e04af272f4 f696c00a04
commit 674b127728
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/2.10/.env
View File

@ -12,7 +12,7 @@ POSTGRES_PORT=5432
DATASTORE_READONLY_PASSWORD=datastore DATASTORE_READONLY_PASSWORD=datastore
# CKAN # CKAN
CKAN_VERSION=2.10 CKAN_VERSION=2.10.4
CKAN_SITE_ID=default CKAN_SITE_ID=default
CKAN_SITE_URL=http://localhost:5000 CKAN_SITE_URL=http://localhost:5000
CKAN_PORT=5000 CKAN_PORT=5000

2
compose/2.10/docker-compose.yml
View File

@ -9,7 +9,7 @@ volumes:
services: services:
ckan: ckan:
container_name: ckan container_name: ckan
image: ghcr.io/keitaroinc/ckan:2.10.2 image: ghcr.io/keitaroinc/ckan:${CKAN_VERSION}
networks: networks:
- frontend - frontend
- backend - backend

5
compose/2.10/solr8/ckan_init_solr.sh
View File

@ -8,7 +8,10 @@
set -e set -e
CKAN_SOLR_SCHEMA_URL=https://raw.githubusercontent.com/ckan/ckan/$CKAN_VERSION/ckan/config/solr/schema.xml MAJOR_VERSION=`echo $CKAN_VERSION | cut -d "." -f 1`
MINOR_VERSION=`echo $CKAN_VERSION | cut -d "." -f 2`
CKAN_SOLR_SCHEMA_URL=https://raw.githubusercontent.com/ckan/ckan/`echo $MAJOR_VERSION.$MINOR_VERSION`/ckan/config/solr/schema.xml
echo "Check whether managed schema exists for CKAN $CKAN_VERSION" echo "Check whether managed schema exists for CKAN $CKAN_VERSION"
if ! curl --output /dev/null --silent --head --fail "$CKAN_SOLR_SCHEMA_URL"; then if ! curl --output /dev/null --silent --head --fail "$CKAN_SOLR_SCHEMA_URL"; then

2
compose/2.9/.ckan-env
View File

@ -36,5 +36,5 @@ CKAN__DATAPUSHER__URL=http://datapusher:8000
CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000/ CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000/
# Solr configuration # Solr configuration
CKAN_VERSION=2.9.9 CKAN_VERSION=2.9.11
CKAN_CORE_NAME=ckan CKAN_CORE_NAME=ckan

2
compose/2.9/.env
View File

@ -12,7 +12,7 @@ POSTGRES_PORT=5432
DATASTORE_READONLY_PASSWORD=datastore DATASTORE_READONLY_PASSWORD=datastore
# CKAN # CKAN
CKAN_VERSION=2.9.9 CKAN_VERSION=2.9.11
CKAN_SITE_ID=default CKAN_SITE_ID=default
CKAN_SITE_URL=http://localhost:5000 CKAN_SITE_URL=http://localhost:5000
CKAN_PORT=5000 CKAN_PORT=5000

2
compose/2.9/solr8/ckan_init_solr.sh
View File

@ -4,7 +4,7 @@
# Arguments are supplied via environment variables: CKAN_CORE_NAME CKAN_VERSION # Arguments are supplied via environment variables: CKAN_CORE_NAME CKAN_VERSION
# Example: # Example:
# CKAN_CORE_NAME=ckan # CKAN_CORE_NAME=ckan
# CKAN_VERSION=2.9.9 # CKAN_VERSION=2.9.11
set -e set -e

2
examples/harvest/.ckan-env
View File

@ -33,5 +33,5 @@ CKAN__HARVEST__MQ__TYPE=redis
CKAN__HARVEST__MQ__HOSTNAME=redis CKAN__HARVEST__MQ__HOSTNAME=redis
# Solr configuration # Solr configuration
CKAN_VERSION=2.9.9 CKAN_VERSION=2.9.11
CKAN_CORE_NAME=ckan CKAN_CORE_NAME=ckan

2
examples/harvest/.env
View File

@ -12,7 +12,7 @@ POSTGRES_PORT=5432
DATASTORE_READONLY_PASSWORD=datastore DATASTORE_READONLY_PASSWORD=datastore
# CKAN # CKAN
CKAN_VERSION=2.9.9 CKAN_VERSION=2.9.11
CKAN_SITE_ID=default CKAN_SITE_ID=default
CKAN_SITE_URL=http://localhost:5000 CKAN_SITE_URL=http://localhost:5000
CKAN_PORT=5000 CKAN_PORT=5000

4
examples/harvest/Dockerfile
View File

@ -1,7 +1,7 @@
################### ###################
### Extensions #### ### Extensions ####
################### ###################
FROM ghcr.io/keitaroinc/ckan:2.9.9 as extbuild FROM ghcr.io/keitaroinc/ckan:2.9.11 as extbuild
# Locations and tags, please use specific tags or revisions # Locations and tags, please use specific tags or revisions
ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest
@ -30,7 +30,7 @@ USER ckan
############ ############
### MAIN ### ### MAIN ###
############ ############
FROM ghcr.io/keitaroinc/ckan:2.9.9 FROM ghcr.io/keitaroinc/ckan:2.9.11
LABEL maintainer="Keitaro Inc <info@keitaro.com>" LABEL maintainer="Keitaro Inc <info@keitaro.com>"

2
examples/s3filestore/.ckan-env
View File

@ -38,5 +38,5 @@ CKANEXT__S3FILESTORE__REGION_NAME=us-east-1
CKANEXT__S3FILESTORE__SIGNATURE_VERSION=s3v4 CKANEXT__S3FILESTORE__SIGNATURE_VERSION=s3v4
# Solr configuration # Solr configuration
CKAN_VERSION=2.9.9 CKAN_VERSION=2.9.11
CKAN_CORE_NAME=ckan CKAN_CORE_NAME=ckan

2
examples/s3filestore/.env
View File

@ -12,7 +12,7 @@ POSTGRES_PORT=5432
DATASTORE_READONLY_PASSWORD=datastore DATASTORE_READONLY_PASSWORD=datastore
# CKAN # CKAN
CKAN_VERSION=2.9.9 CKAN_VERSION=2.9.11
CKAN_SITE_ID=default CKAN_SITE_ID=default
CKAN_SITE_URL=http://localhost:5000 CKAN_SITE_URL=http://localhost:5000
CKAN_PORT=5000 CKAN_PORT=5000

4
examples/s3filestore/Dockerfile
View File

@ -1,7 +1,7 @@
################### ###################
### Extensions #### ### Extensions ####
################### ###################
FROM ghcr.io/keitaroinc/ckan:2.9.9 as extbuild FROM ghcr.io/keitaroinc/ckan:2.9.11 as extbuild
# Locations and tags, please use specific tags or revisions # Locations and tags, please use specific tags or revisions
ENV S3FILESTORE_GIT_URL=https://github.com/keitaroinc/ckanext-s3filestore ENV S3FILESTORE_GIT_URL=https://github.com/keitaroinc/ckanext-s3filestore
@ -20,7 +20,7 @@ USER ckan
############ ############
### MAIN ### ### MAIN ###
############ ############
FROM ghcr.io/keitaroinc/ckan:2.9.9 FROM ghcr.io/keitaroinc/ckan:2.9.11
LABEL maintainer="Keitaro Inc <info@keitaro.com>" LABEL maintainer="Keitaro Inc <info@keitaro.com>"

4
images/ckan/2.10/Dockerfile
View File

@ -4,11 +4,11 @@
FROM alpine:3.17.2 as ckanbuild FROM alpine:3.17.2 as ckanbuild
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.10.3 ENV IMAGE_TAG=2.10.4
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.10.3 ENV GIT_BRANCH=ckan-2.10.4
# Set src dirs # Set src dirs
ENV SRC_DIR=/srv/app/src ENV SRC_DIR=/srv/app/src

4
images/ckan/2.10/Dockerfile.focal
View File

@ -4,11 +4,11 @@
FROM ubuntu:focal-20210827 as ckanbuild FROM ubuntu:focal-20210827 as ckanbuild
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.10.3-focal ENV IMAGE_TAG=2.10.4-focal
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.10.3 ENV GIT_BRANCH=ckan-2.10.4
# Set timezone # Set timezone
ENV TZ=UTC ENV TZ=UTC

4
images/ckan/2.9/Dockerfile
View File

@ -4,11 +4,11 @@
FROM alpine:3.13.7 as ckanbuild FROM alpine:3.13.7 as ckanbuild
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.9.10 ENV IMAGE_TAG=2.9.11
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.9.10 ENV GIT_BRANCH=ckan-2.9.11
# Set src dirs # Set src dirs
ENV SRC_DIR=/srv/app/src ENV SRC_DIR=/srv/app/src

4
images/ckan/2.9/Dockerfile.focal
View File

@ -4,11 +4,11 @@
FROM ubuntu:focal-20210827 as ckanbuild FROM ubuntu:focal-20210827 as ckanbuild
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.9.10-focal ENV IMAGE_TAG=2.9.11-focal
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.9.10 ENV GIT_BRANCH=ckan-2.9.11
# Set timezone # Set timezone
ENV TZ=UTC ENV TZ=UTC