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

Bump DataPusher version (0.0.21) and DataPusher and CKAN to listen on ipv6 addresses #67

Merged
merged 2 commits into from
Jul 1, 2024
Merged

Bump DataPusher version (0.0.21) and DataPusher and CKAN to listen on ipv6 addresses #67

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
162d9c2
Bump version
kowh-ai May 27, 2024
3692a8b
Update CKAN listen address to ipv6 also
kowh-ai May 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
2 changes: 1 addition & 1 deletion ckan-2.10/base/setup/start_ckan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ UWSGI_OPTS="--plugins http,python \
--wsgi-file /srv/app/wsgi.py \
--module wsgi:application \
--uid 92 --gid 92 \
--http 0.0.0.0:5000 \
--http [::]:5000 \
--master --enable-threads \
--lazy-apps \
-p 2 -L -b 32768 --vacuum \
Expand Down
2 changes: 1 addition & 1 deletion ckan-master/base/setup/start_ckan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ UWSGI_OPTS="--plugins http,python \
--wsgi-file /srv/app/wsgi.py \
--module wsgi:application \
--uid 92 --gid 92 \
--http 0.0.0.0:5000 \
--http [::]:5000 \
--master --enable-threads \
--lazy-apps \
-p 2 -L -b 32768 --vacuum \
Expand Down
8 changes: 7 additions & 1 deletion datapusher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
FROM alpine:3.14

ARG DATAPUSHER_VERSION=${DATAPUSHER_VERSION}

ENV TZ=UTC
ENV APP_DIR=/srv/app
ENV GIT_URL https://github.com/ckan/datapusher.git
ENV JOB_CONFIG ${APP_DIR}/datapusher_settings.py

WORKDIR ${APP_DIR}

# Set up timezone
RUN apk add --no-cache tzdata
RUN echo ${TZ} > /etc/timezone

RUN apk add --no-cache \
python3 \
py3-pip \
Expand Down Expand Up @@ -55,4 +61,4 @@ USER ckan

EXPOSE 8800
CMD ["sh", "-c", \
"uwsgi --plugins=http,python --enable-threads --http=0.0.0.0:8800 --socket=/tmp/uwsgi.sock --ini=`echo ${APP_DIR}`/datapusher-uwsgi.ini --wsgi-file=`echo ${APP_DIR}`/datapusher.wsgi"]
"uwsgi --plugins=http,python --enable-threads --http=[::]:8800 --socket=/tmp/uwsgi.sock --ini=`echo ${APP_DIR}`/datapusher-uwsgi.ini --wsgi-file=`echo ${APP_DIR}`/datapusher.wsgi"]
2 changes: 1 addition & 1 deletion datapusher/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: all help build build-all push
SHELL := /bin/bash
DATAPUSHER_VERSION=0.0.20
DATAPUSHER_VERSION=0.0.21
TAG_NAME="ckan/ckan-base-datapusher:$(DATAPUSHER_VERSION)"

all: help
Expand Down