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

Merge pull request #87 from mjanez/ckan-2.9.9 

Update tags
This commit is contained in:
mjanez 2023-10-02 11:02:18 +02:00 committed by GitHub
parent e803e8d639 4ecd0a260c
commit 0077377968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker-build.yml vendored
View File

@ -14,7 +14,7 @@ on:
env: env:
REGISTRY: ghcr.io REGISTRY: ghcr.io
IMAGE_NAME: ckan-spatial IMAGE_NAME: ckan-spatial
TAG: ghcr.io/${{ github.repository }}:${{ github.head_ref }} TAG: ghcr.io/ckan-spatial::${{ github.head_ref }}
CONTEXT: . CONTEXT: .
BRANCH: ${{ github.head_ref }} BRANCH: ${{ github.head_ref }}
DOCKERFILE_PATH: /ckan DOCKERFILE_PATH: /ckan

2
.github/workflows/docker-manual.yml vendored
View File

@ -5,7 +5,7 @@ on: workflow_dispatch
env: env:
REGISTRY: ghcr.io REGISTRY: ghcr.io
IMAGE_NAME: ckan-spatial IMAGE_NAME: ckan-spatial
TAG: ghcr.io/${{ github.repository }}:${{ github.ref_name }} TAG: ghcr.io/ckan-spatial:${{ github.ref_name }}
CONTEXT: . CONTEXT: .
BRANCH: ${{ github.ref_name }} BRANCH: ${{ github.ref_name }}
DOCKERFILE_PATH: /ckan DOCKERFILE_PATH: /ckan

22
ckan/Dockerfile.dev
View File

@ -1,13 +1,9 @@
FROM ghcr.io/mjanez/ckan-base-spatial:ckan-2.9.9-dev FROM ghcr.io/mjanez/ckan-base-spatial:ckan-2.9.9-dev
LABEL maintainer="mnl.janez@gmail.com"
# Set up environment variables # Set up environment variables
ENV APP_DIR=/srv/app ENV APP_DIR=/srv/app \
ENV TZ=UTC TZ=UTC \
ENV SRC_EXTENSIONS_DIR=/srv/app/src_extensions SRC_EXTENSIONS_DIR=/srv/app/src_extensions
# Set working directory
WORKDIR ${APP_DIR}
RUN echo ${TZ} > /etc/timezone && \ RUN echo ${TZ} > /etc/timezone && \
set -ex && apk --no-cache add sudo && \ set -ex && apk --no-cache add sudo && \
@ -51,18 +47,18 @@ RUN echo ${TZ} > /etc/timezone && \
# to get them mounted in this image at runtime # to get them mounted in this image at runtime
# Used to configure the container environment by setting environment variables, creating users, running initialization scripts, .etc # Used to configure the container environment by setting environment variables, creating users, running initialization scripts, .etc
COPY docker-entrypoint.d/* docker-entrypoint.d/ COPY docker-entrypoint.d/* /docker-entrypoint.d/
# Update who.ini with PROXY_CKAN_LOCATION # Update who.ini with PROXY_CKAN_LOCATION
COPY setup/who.ini ./ COPY setup/who.ini ${APP_DIR}/
# Override start_ckan.sh with DEV sh # Override start_ckan.sh with DEV sh
COPY setup/start_ckan_development.sh.override start_ckan_development.sh COPY setup/start_ckan_development.sh.override ${APP_DIR}/start_ckan_development.sh
RUN chmod +x start_ckan_development.sh RUN chmod +x ${APP_DIR}/start_ckan_development.sh
# Apply any patches needed to CKAN core or any of the built extensions (not the # Apply any patches needed to CKAN core or any of the built extensions (not the
# runtime mounted ones!) # runtime mounted ones)
COPY patches patches COPY patches ${APP_DIR}/patches
RUN for d in $APP_DIR/patches/*; do \ RUN for d in $APP_DIR/patches/*; do \
if [ -d $d ]; then \ if [ -d $d ]; then \