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

updates ckan version and adds xloader version control #139

Merged
merged 3 commits into from
Nov 27, 2024
Merged

updates ckan version and adds xloader version control #139

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d768e9
updates ckan version and adds xloader version control
Filip3mac Nov 20, 2024
4d1e141
fixes bugged package
Filip3mac Nov 20, 2024
fc2017d
Remove ckan 2.7 and 2.8 from build pipeline
stojanovskis1 Nov 27, 2024
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
19 changes: 13 additions & 6 deletions images/ckan/2.10/Dockerfile.xloader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
FROM alpine:3.17.2 as ckanbuild

# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.10.4-xloader
ENV IMAGE_TAG=2.10.5-xloader

# Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.10.4
ENV GIT_BRANCH=ckan-2.10.5

# Set src dirs
ENV SRC_DIR=/srv/app/src
Expand Down Expand Up @@ -100,6 +100,11 @@ FROM alpine:3.17.2
LABEL maintainer="Keitaro Inc <[email protected]>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan

# Xloader version control

ENV XLOADER_URL=https://github.com/ckan/ckanext-xloader.git
ENV XLOADER_VERSION=1.1.2

ENV APP_DIR=/srv/app
ENV SRC_DIR=/srv/app/src
ENV CKAN_DIR=${SRC_DIR}/ckan
Expand Down Expand Up @@ -131,10 +136,10 @@ RUN apk add --no-cache \
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
python ${SRC_DIR}/get-pip.py

### XLoader ###
RUN pip3 install -e 'git+https://github.com/keitaroinc/ckanext-xloader.git@master#egg=ckanext-xloader' && \
pip3 install -r ${SRC_DIR}/ckanext-xloader/requirements.txt && \
pip3 install -U requests[security]
### XLoader ###
RUN pip3 install -e git+${XLOADER_URL}@${XLOADER_VERSION}#egg=ckanext-xloader && \
pip3 install -r ${SRC_DIR}/ckanext-xloader/requirements.txt && \
pip3 install -U requests[security]

# Get artifacts from build stages
COPY --from=ckanbuild /wheels /srv/app/wheels
Expand All @@ -150,6 +155,8 @@ RUN addgroup -g 92 -S ckan && \

WORKDIR ${CKAN_DIR}

#Removes bugged package
RUN rm -rf /usr/lib/python3.10/site-packages/packaging*
# Install CKAN
RUN pip install -e /srv/app/src/ckan && \
cp who.ini ${APP_DIR} && \
Expand Down
Loading