diff --git a/Readme.md b/Readme.md index 15318d8..ebc9369 100644 --- a/Readme.md +++ b/Readme.md @@ -48,7 +48,7 @@ We recommend to use a multi-stage approach to extend the docker images that we p ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.2 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild # Switch to the root user USER root @@ -62,7 +62,7 @@ RUN pip wheel --wheel-dir=/wheels git+https://github.com/acmecorp/ckanext-acme@0 ############ ### MAIN ### ############ -FROM ghcr.io/keitaroinc/ckan:2.9.2 +FROM ghcr.io/keitaroinc/ckan:2.9.3 # Add the custom extensions to the plugins list ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher acme @@ -92,9 +92,9 @@ You can add scripts to CKAN custom images and copy them to the *docker-afterinit ## Build To build a CKAN image run: ```sh -docker build --tag ghcr.io/keitaroinc/ckan:2.9.2 images/ckan/2.9 +docker build --tag ghcr.io/keitaroinc/ckan:2.9.3 images/ckan/2.9 ``` -The –-tag ghcr.io/keitaroinc/ckan:2.9.2 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.2 and 'images/ckan/2.9' at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are. +The –-tag ghcr.io/keitaroinc/ckan:2.9.3 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.3 and 'images/ckan/2.9' at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are. ## Upload to DockerHub >*It's recommended to upload built images to DockerHub* diff --git a/compose/.env b/compose/.env index 89a9c51..446d552 100644 --- a/compose/.env +++ b/compose/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.9.2 +CKAN_VERSION=2.9.3 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/compose/solr/solrconfig-2.7.10.xml b/compose/solr/solrconfig-2.7.10.xml deleted file mode 120000 index 207d108..0000000 --- a/compose/solr/solrconfig-2.7.10.xml +++ /dev/null @@ -1 +0,0 @@ -solrconfig-2.8.7.xml \ No newline at end of file diff --git a/compose/solr/solrconfig-2.7.11.xml b/compose/solr/solrconfig-2.7.11.xml new file mode 120000 index 0000000..0f440c8 --- /dev/null +++ b/compose/solr/solrconfig-2.7.11.xml @@ -0,0 +1 @@ +solrconfig-2.8.8.xml \ No newline at end of file diff --git a/compose/solr/solrconfig-2.8.7.xml b/compose/solr/solrconfig-2.8.8.xml similarity index 100% rename from compose/solr/solrconfig-2.8.7.xml rename to compose/solr/solrconfig-2.8.8.xml diff --git a/compose/solr/solrconfig-2.9.2.xml b/compose/solr/solrconfig-2.9.3.xml similarity index 100% rename from compose/solr/solrconfig-2.9.2.xml rename to compose/solr/solrconfig-2.9.3.xml diff --git a/examples/harvest/.env b/examples/harvest/.env index 514724c..446d552 100644 --- a/examples/harvest/.env +++ b/examples/harvest/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.9.1 +CKAN_VERSION=2.9.3 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/harvest/Dockerfile b/examples/harvest/Dockerfile index 55c0d41..9dc972c 100644 --- a/examples/harvest/Dockerfile +++ b/examples/harvest/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.2 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild # Locations and tags, please use specific tags or revisions ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest @@ -30,7 +30,7 @@ USER ckan ############ ### MAIN ### ############ -FROM ghcr.io/keitaroinc/ckan:2.9.2 +FROM ghcr.io/keitaroinc/ckan:2.9.3 LABEL maintainer="Keitaro Inc " diff --git a/examples/s3filestore/.env b/examples/s3filestore/.env index d519cb2..a6a2833 100644 --- a/examples/s3filestore/.env +++ b/examples/s3filestore/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.8.7 +CKAN_VERSION=2.8.8 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile index 8f58d14..9470e72 100644 --- a/examples/s3filestore/Dockerfile +++ b/examples/s3filestore/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.8.7 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.8.8 as extbuild # Locations and tags, please use specific tags or revisions ENV S3FILESTORE_GIT_URL=https://github.com/keitaroinc/ckanext-s3filestore @@ -20,7 +20,7 @@ USER ckan ############ ### MAIN ### ############ -FROM ghcr.io/keitaroinc/ckan:2.8.7 +FROM ghcr.io/keitaroinc/ckan:2.8.8 LABEL maintainer="Keitaro Inc " diff --git a/images/ckan/2.7/Dockerfile b/images/ckan/2.7/Dockerfile index 3b042ad..df2808b 100644 --- a/images/ckan/2.7/Dockerfile +++ b/images/ckan/2.7/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.13 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.7.10 +ENV IMAGE_TAG=2.7.11 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.7.10 +ENV GIT_BRANCH=ckan-2.7.11 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.7/Dockerfile.focal b/images/ckan/2.7/Dockerfile.focal index 6d55f10..4d64afb 100644 --- a/images/ckan/2.7/Dockerfile.focal +++ b/images/ckan/2.7/Dockerfile.focal @@ -1,14 +1,14 @@ ################## ### Build CKAN ### ################## -FROM ubuntu:focal-20210217 as ckanbuild +FROM ubuntu:focal-20210416 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.7.10-focal +ENV IMAGE_TAG=2.7.11-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.7.10 +ENV GIT_BRANCH=ckan-2.7.11 # Set timezone ENV TZ=UTC @@ -89,7 +89,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1 ########################### ### Default-Extensions #### ########################### -FROM ubuntu:focal-20210217 as extbuild +FROM ubuntu:focal-20210416 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -123,7 +123,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM ubuntu:focal-20210217 +FROM ubuntu:focal-20210416 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile index a7af7b4..ded72f4 100644 --- a/images/ckan/2.8/Dockerfile +++ b/images/ckan/2.8/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.13 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.8.7 +ENV IMAGE_TAG=2.8.8 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.8.7 +ENV GIT_BRANCH=ckan-2.8.8 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.8/Dockerfile.focal b/images/ckan/2.8/Dockerfile.focal index adc8b18..c89f38f 100644 --- a/images/ckan/2.8/Dockerfile.focal +++ b/images/ckan/2.8/Dockerfile.focal @@ -1,14 +1,14 @@ ################## ### Build CKAN ### ################## -FROM ubuntu:focal-20210217 as ckanbuild +FROM ubuntu:focal-20210416 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.8.7-focal +ENV IMAGE_TAG=2.8.8-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.8.7 +ENV GIT_BRANCH=ckan-2.8.8 # Set timezone ENV TZ=UTC @@ -81,7 +81,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1 ########################### ### Default-Extensions #### ########################### -FROM ubuntu:focal-20210217 as extbuild +FROM ubuntu:focal-20210416 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -115,7 +115,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM ubuntu:focal-20210217 +FROM ubuntu:focal-20210416 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile index 0baa7c5..1080e3b 100644 --- a/images/ckan/2.9/Dockerfile +++ b/images/ckan/2.9/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.13 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.9.2 +ENV IMAGE_TAG=2.9.3 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.2 +ENV GIT_BRANCH=ckan-2.9.3 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.9/Dockerfile.focal b/images/ckan/2.9/Dockerfile.focal index 278cae9..39913fb 100644 --- a/images/ckan/2.9/Dockerfile.focal +++ b/images/ckan/2.9/Dockerfile.focal @@ -1,14 +1,14 @@ ################## ### Build CKAN ### ################## -FROM ubuntu:focal-20210217 as ckanbuild +FROM ubuntu:focal-20210416 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.9.2-focal +ENV IMAGE_TAG=2.9.3-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.2 +ENV GIT_BRANCH=ckan-2.9.3 # Set timezone ENV TZ=UTC @@ -87,7 +87,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1 ########################### ### Default-Extensions #### ########################### -FROM ubuntu:focal-20210217 as extbuild +FROM ubuntu:focal-20210416 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -124,7 +124,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM ubuntu:focal-20210217 +FROM ubuntu:focal-20210416 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan