Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update tags #87

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Update tags #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7032ba
Update tags
mjanez Oct 2, 2023
4ecd0a2
Maintain stable Dockerfile.dev
mjanez Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ckan-spatial
TAG: ghcr.io/${{ github.repository }}:${{ github.head_ref }}
TAG: ghcr.io/ckan-spatial::${{ github.head_ref }}
CONTEXT: .
BRANCH: ${{ github.head_ref }}
DOCKERFILE_PATH: /ckan
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: workflow_dispatch
env:
REGISTRY: ghcr.io
IMAGE_NAME: ckan-spatial
TAG: ghcr.io/${{ github.repository }}:${{ github.ref_name }}
TAG: ghcr.io/ckan-spatial:${{ github.ref_name }}
CONTEXT: .
BRANCH: ${{ github.ref_name }}
DOCKERFILE_PATH: /ckan
Expand Down
22 changes: 9 additions & 13 deletions ckan/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
FROM ghcr.io/mjanez/ckan-base-spatial:ckan-2.9.9-dev
LABEL maintainer="[email protected]"

# Set up environment variables
ENV APP_DIR=/srv/app
ENV TZ=UTC
ENV SRC_EXTENSIONS_DIR=/srv/app/src_extensions

# Set working directory
WORKDIR ${APP_DIR}
ENV APP_DIR=/srv/app \
TZ=UTC \
SRC_EXTENSIONS_DIR=/srv/app/src_extensions

RUN echo ${TZ} > /etc/timezone && \
set -ex && apk --no-cache add sudo && \
Expand Down Expand Up @@ -51,18 +47,18 @@ RUN echo ${TZ} > /etc/timezone && \
# 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
COPY docker-entrypoint.d/* docker-entrypoint.d/
COPY docker-entrypoint.d/* /docker-entrypoint.d/

# Update who.ini with PROXY_CKAN_LOCATION
COPY setup/who.ini ./
COPY setup/who.ini ${APP_DIR}/

# Override start_ckan.sh with DEV sh
COPY setup/start_ckan_development.sh.override start_ckan_development.sh
RUN chmod +x start_ckan_development.sh
COPY setup/start_ckan_development.sh.override ${APP_DIR}/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
# runtime mounted ones!)
COPY patches patches
# runtime mounted ones)
COPY patches ${APP_DIR}/patches

RUN for d in $APP_DIR/patches/*; do \
if [ -d $d ]; then \
Expand Down
Loading