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

AV-2031: Update datapusher and qsv #2193

Merged
merged 1 commit into from
Mar 14, 2024
Merged

AV-2031: Update datapusher and qsv #2193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 14 additions & 9 deletions docker/datapusher-plus/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# Build datapusher+
FROM public.ecr.aws/docker/library/rust:alpine3.19 as cargo_build

RUN apk add build-base linux-headers
RUN cargo install [email protected] --locked --bin qsvdp -F datapusher_plus,luau


#############################
### Build DataPusher Plus ###
#############################
FROM public.ecr.aws/docker/library/python:3.10.9-alpine3.17
FROM public.ecr.aws/docker/library/python:3.10.13-alpine3.19

# Set timezone
ENV TZ=UTC
Expand All @@ -16,20 +23,18 @@ ENV CFG_DIR=/etc/ckan/datapusher-plus

WORKDIR ${SRC_DIR}

RUN apk add build-base linux-headers git gettext curl py3-wheel
RUN apk add build-base linux-headers gettext curl py3-wheel uchardet

#install qsv;
RUN wget https://github.com/jqnatividad/qsv/releases/download/0.112.0/qsv-0.112.0-x86_64-unknown-linux-musl.zip -P /tmp
RUN unzip /tmp/qsv-0.112.0-x86_64-unknown-linux-musl.zip -d /tmp
RUN rm /tmp/qsv-0.112.0-x86_64-unknown-linux-musl.zip
RUN mv /tmp/qsv* /usr/local/bin
COPY --from=cargo_build /usr/local/cargo/bin/qsvdp /usr/local/bin

RUN python -m venv ${VENV}
RUN ${VENV}/bin/pip install uwsgi

ENV DATAPUSHER_COMMIT=90325a432e029138c3b47dc5e2edd19893c05411

# Install DataPusher+ from repository
RUN git clone https://github.com/dathere/datapusher-plus.git --depth 1 --branch 0.15.0
# Install DataPusher+ from repository, switch repository once latest PR on iconv has been merged
RUN wget https://github.com/Zharktas/datapusher-plus/archive/${DATAPUSHER_COMMIT}.zip -P /tmp
RUN unzip /tmp/${DATAPUSHER_COMMIT}.zip -d ${SRC_DIR} && mv ${SRC_DIR}/datapusher-plus-${DATAPUSHER_COMMIT} ${SRC_DIR}/datapusher-plus && rm /tmp/${DATAPUSHER_COMMIT}.zip
RUN cd ${SRC_DIR}/datapusher-plus && \
${VENV}/bin/pip install -r requirements-dev.txt && \
${VENV}/bin/pip install -e .
Expand Down
Loading