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

Merge branch 'ckan-2.9.9' of https://github.com/mjanez/ckan-docker into ckan-2.9.9

This commit is contained in:
mjanez 2023-10-02 10:03:53 +02:00
parent 5de535d018 8a599a11a4
commit 27dcb57314
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ jobs:
push: true push: true
tags: ${{ env.TAG }} tags: ${{ env.TAG }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
context: ${{ env.CONTEXT }} context: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}
file: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }} file: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}
- name: Run Trivy container image vulnerability scanner - name: Run Trivy container image vulnerability scanner

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

@ -48,7 +48,7 @@ jobs:
push: true push: true
tags: ${{ env.TAG }} tags: ${{ env.TAG }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
context: ${{ env.CONTEXT }} context: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}
file: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }} file: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}
- name: Linting Dockerfile with hadolint in GH Actions - name: Linting Dockerfile with hadolint in GH Actions

4
ckan/Dockerfile
View File

@ -9,7 +9,7 @@ ENV TZ=UTC
WORKDIR ${APP_DIR} WORKDIR ${APP_DIR}
# requirements.txt files fixed until next releases # requirements.txt files fixed until next releases
COPY req_fixes ./req_fixes COPY req_fixes req_fixes
# Extensions # Extensions
### XLoader - 1.0.1 ### ### XLoader - 1.0.1 ###
@ -60,7 +60,7 @@ COPY docker-entrypoint.d/* /docker-entrypoint.d/
COPY setup/who.ini ./ COPY setup/who.ini ./
# Apply any patches needed to CKAN core # Apply any patches needed to CKAN core
COPY patches ./ COPY patches 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 \

4
ckan/Dockerfile.dev
View File

@ -57,12 +57,12 @@ COPY docker-entrypoint.d/* docker-entrypoint.d/
COPY setup/who.ini ./ COPY setup/who.ini ./
# 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 start_ckan_development.sh
RUN chmod +x start_ckan_development.sh RUN chmod +x 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 ./ COPY patches 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 \

2
ckan/Dockerfile.ghcr
View File

@ -21,7 +21,7 @@ COPY docker-entrypoint.d/* docker-entrypoint.d/
COPY setup/who.ini ./ COPY setup/who.ini ./
# Apply any patches needed to CKAN core # Apply any patches needed to CKAN core
COPY patches ./ COPY patches patches
# Updated version of the Dockerfile RUN command that skips applying a patch if a reversed or previously applied patch is detected # Updated version of the Dockerfile RUN command that skips applying a patch if a reversed or previously applied patch is detected
RUN for d in $APP_DIR/patches/*; do \ RUN for d in $APP_DIR/patches/*; do \