Skip to content

Commit f950c57

Browse files
Revert changes to configuration ini file path
1 parent 47fd18c commit f950c57

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

sddi-base/Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y \
2121
libxml2-dev \
2222
libxslt-dev
2323

24-
RUN pip install -U markupsafe==2.0.1 sqlalchemy==1.4.41
24+
# RUN pip install -U markupsafe==2.0.1 sqlalchemy==1.4.41
2525

2626
# ckanext-hierarchy ###########################################################
2727
ARG CKANEXT_HIERARCHY_VERSION="v1.2.2"
@@ -96,7 +96,6 @@ FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as runtime
9696

9797
ENV CKAN_DIR=${SRC_DIR}/ckan
9898
ENV DATA_DIR=/srv/app/data
99-
ENV CKAN_INI=${APP_DIR}/production.ini
10099
ENV UWSGI_HARAKIRI=50
101100

102101
USER root
@@ -176,7 +175,7 @@ ENV CKAN__PLUGINS "envvars image_view text_view webpage_view datastore \
176175
clamav"
177176

178177
RUN set -ex && \
179-
ckan generate config ${APP_DIR}/production.ini
178+
ckan generate config ${CKAN_INI}
180179

181180
RUN set -ex && \
182181
ckan config-tool "${CKAN_INI}" "ckan.plugins = ${CKAN__PLUGINS}" && \

sddi/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION}
8888

8989
ENV CKAN_DIR=${SRC_DIR}/ckan
9090
ENV DATA_DIR=/srv/app/data
91-
ENV CKAN_INI=${APP_DIR}/production.ini
9291
ENV UWSGI_HARAKIRI=50
9392

9493
USER root
@@ -156,7 +155,7 @@ ENV CKAN__PLUGINS "envvars image_view text_view webpage_view datastore \
156155
clamav"
157156

158157
RUN set -ex && \
159-
ckan generate config ${APP_DIR}/production.ini
158+
ckan generate config ${CKAN_INI}
160159

161160
RUN set -ex && \
162161
ckan config-tool "${CKAN_INI}" "ckan.plugins = ${CKAN__PLUGINS}" && \

0 commit comments

Comments
 (0)