Skip to content

Commit

Permalink
fixes bugged package
Browse files Browse the repository at this point in the history
  • Loading branch information
Filip3mac committed Nov 20, 2024
1 parent 7d768e9 commit 4d1e141
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions images/ckan/2.10/Dockerfile.xloader
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ ENV IMAGE_TAG=2.10.5-xloader
ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.10.5

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

# Set src dirs
ENV SRC_DIR=/srv/app/src
ENV PIP_SRC=${SRC_DIR}
Expand Down Expand Up @@ -103,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 @@ -134,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+${XLOADER_URL}.git@${XLOADER_VERSION}#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 @@ -153,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

0 comments on commit 4d1e141

Please sign in to comment.