diff --git a/README.md b/README.md index 6bab616..f5548a7 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,7 @@ To start the containers: See [CKAN Images](#ckan-images) for more details of what happens when using development mode. + ##### Create an extension You can use the ckan [extension](https://docs.ckan.org/en/latest/extensions/tutorial.html#creating-a-new-extension) instructions to create a CKAN extension, only executing the command inside the CKAN container and setting the mounted `src/` folder as output: diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 75001e9..8f0532e 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -1,5 +1,4 @@ FROM ckan/ckan-base:2.10.1 -#FROM ckan/ckan-base:2.9.9 # Set up environment variables ENV APP_DIR=/srv/app diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index 8488f0b..1720f71 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -1,5 +1,4 @@ -FROM ckan/ckan-base:2.10.1-dev -#FROM ckan/ckan-base:2.9.9-dev +FROM ckan/ckan-dev:2.10.1 # Set up environment variables @@ -56,4 +55,4 @@ RUN for d in $APP_DIR/patches/*; do \ cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \ done ; \ fi ; \ - done \ No newline at end of file + done diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 0cf6312..dc2ecdf 100755 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -8,7 +8,6 @@ volumes: services: ckan-dev: - container_name: ${CKAN_CONTAINER_NAME} build: context: ckan/ dockerfile: Dockerfile.dev @@ -33,14 +32,12 @@ services: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] datapusher: - container_name: ${DATAPUSHER_CONTAINER_NAME} image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION} restart: unless-stopped healthcheck: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"] db: - container_name: ${POSTGRESQL_CONTAINER_NAME} build: context: postgresql/ environment: @@ -60,7 +57,6 @@ services: test: ["CMD", "pg_isready", "-U", "${POSTGRES_USER}", "-d", "${POSTGRES_DB}"] solr: - container_name: ${SOLR_CONTAINER_NAME} image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} volumes: - solr_data:/var/solr @@ -69,8 +65,7 @@ services: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8983/solr/"] redis: - container_name: ${REDIS_CONTAINER_NAME} image: redis:${REDIS_VERSION} restart: unless-stopped healthcheck: - test: ["CMD", "redis-cli", "-e", "QUIT"] \ No newline at end of file + test: ["CMD", "redis-cli", "-e", "QUIT"]