Finish up changes for new patch version of CKAN 2.10.5

compose/2.10/.env

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

compose/2.10/docker-compose.yml

@@ -1,6 +1,4 @@
 # docker-compose build && docker-compose up -d
-version: "3.8"
-
 volumes:
   ckan_data:
   pg_data:
@@ -9,9 +7,7 @@ volumes:
 services:
   ckan:
     container_name: ckan
-    build: 
-      context: ../../images/ckan/2.10
-      dockerfile: Dockerfile
+    image: ghcr.io/keitaroinc/ckan:${CKAN_VERSION}
     networks:
       - frontend
       - backend

images/ckan/2.10/Dockerfile

@@ -1,7 +1,7 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM alpine:3.17.2 as ckanbuild
+FROM alpine:3.17.2 AS ckanbuild
 
 # Used by Github Actions to tag the image with
 ENV IMAGE_TAG=2.10.5
@@ -63,7 +63,7 @@ RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==22.10.2 greenlet==2.0.2
 ###########################
 ### Default-Extensions ####
 ###########################
-FROM alpine:3.17.2 as extbuild
+FROM alpine:3.17.2 AS extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src

images/ckan/2.10/Dockerfile.focal

@@ -1,7 +1,7 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM ubuntu:focal-20210827 as ckanbuild
+FROM ubuntu:focal-20210827 AS ckanbuild
 
 # Used by Github Actions to tag the image with
 ENV IMAGE_TAG=2.10.5-focal
@@ -86,7 +86,7 @@ RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==22.10.2 greenlet==2.0.2
 ###########################
 ### Default-Extensions ####
 ###########################
-FROM ubuntu:focal-20210827 as extbuild
+FROM ubuntu:focal-20210827 AS extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src