gitea/ckan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for dev-v2.10

Browse Source
This commit is contained in:
Brett 2022-11-26 14:15:06 +01:00
parent a1c2fe512e
commit 2c9427d177
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -55,7 +55,7 @@ CKAN_REDIS_URL=redis://redis:6379/1
TEST_CKAN_REDIS_URL=redis://redis:6379/1 TEST_CKAN_REDIS_URL=redis://redis:6379/1
# Datapusher # Datapusher
DATAPUSHER_VERSION=0.0.17 DATAPUSHER_VERSION=0.0.18
CKAN_DATAPUSHER_URL=http://datapusher:8800 CKAN_DATAPUSHER_URL=http://datapusher:8800
CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000 CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
DATAPUSHER_REWRITE_RESOURCES=True DATAPUSHER_REWRITE_RESOURCES=True

2
ckan/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ckan/ckan-base:master-4a43842 FROM ckan/ckan-base:dev-v2.10
#FROM ckan/ckan-base:2.9.7 #FROM ckan/ckan-base:2.9.7
# Set up environment variables # Set up environment variables

10
datapusher/Dockerfile
View File

@ -34,14 +34,8 @@ RUN apk add --no-cache \
RUN mkdir ${APP_DIR}/src && cd ${APP_DIR}/src && \ RUN mkdir ${APP_DIR}/src && cd ${APP_DIR}/src && \
git clone -b ${GIT_BRANCH} --depth=1 --single-branch ${GIT_URL} && \ git clone -b ${GIT_BRANCH} --depth=1 --single-branch ${GIT_URL} && \
cd datapusher && \ cd datapusher && \
python3 setup.py install python3 setup.py install && \
pip3 install --no-cache-dir -r requirements.txt
## Need an custom version of requirements.txt (with an old release of Werkzeug)
COPY setup/requirements.txt ${APP_DIR}/src/
RUN cd ${APP_DIR}/src && \
pip3 install --no-cache-dir -r requirements.txt
RUN apk del .build-deps && \ RUN apk del .build-deps && \
cp ${APP_DIR}/src/datapusher/deployment/*.* ${APP_DIR} && \ cp ${APP_DIR}/src/datapusher/deployment/*.* ${APP_DIR} && \