Merge pull request #555 from wri/10-17-force-pipeline

10 17 force pipeline
wri · Oct 17, 2024 · 3ef198d · 3ef198d
2 parents c892126 + 5d411c7
commit 3ef198d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/ckan-backend-dev/ckan/Dockerfile.dev b/ckan-backend-dev/ckan/Dockerfile.dev
@@ -110,6 +110,7 @@ RUN ckan config-tool ${CKAN_INI} "api_token.jwt.algorithm = RS256" && \
 COPY docker-entrypoint.d/* /docker-entrypoint.d/
 
 RUN ckan config-tool ${CKAN_INI} "ckan.cors.origin_allow_all = True"
+RUN ckan config-tool ${CKAN_INI} "ckan.root_path = /private-admin/{{LANG}}"
 
 COPY setup/who.ini ${APP_DIR}/src/ckan/who.ini
 

diff --git a/deployment/ckan/Dockerfile b/deployment/ckan/Dockerfile
@@ -66,6 +66,7 @@ ENV CKAN__PLUGINS image_view text_view webpage_view resource_proxy datatables_vi
 
 RUN ckan config-tool ${CKAN_INI} "ckan.plugins = ${CKAN__PLUGINS}"
 RUN ckan config-tool ${CKAN_INI} "ckan.auth.create_user_via_web = false"
+RUN ckan config-tool ${CKAN_INI} "ckan.root_path = /private-admin/{{LANG}}"
 
 USER ckan
 
diff --git a/deployment/helm-templates/values.yaml.dev.template b/deployment/helm-templates/values.yaml.dev.template
@@ -10,8 +10,6 @@ ckan:
       CKANEXT__REPO__SRCPATH: /srv/app/src
       CKAN_INI: /srv/app/production.ini
       CKAN_SITE_ID: wri-dev 
-      CKAN_ROOT_PATH: /private-admin/{{LANG}}
-      CKAN__ROOT_PATH: /private-admin/{{LANG}}
       CKAN__SITE_URL: https://wri.dev.frontend.datopian.com
       CKAN_SITE_URL: https://wri.dev.frontend.datopian.com
       CKAN_HOMEPAGE_STYLE: "2"