Merge pull request #77 from ckan/Remove-Supervisor-plus-tidyup

Updates to CKAN 2.11 and master images (remove supervisor and tidy up)
ckan · Oct 11, 2024 · 02dc531 · 02dc531
2 parents dea7460 + 6740ece
commit 02dc531
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 136 deletions.
diff --git a/ContainerCanary/canary_darwin_amd64 b/ContainerCanary/canary_darwin_amd64
diff --git a/ContainerCanary/canary_darwin_amd64.sha256sum b/ContainerCanary/canary_darwin_amd64.sha256sum
diff --git a/ContainerCanary/ckan.yaml b/ContainerCanary/ckan.yaml
diff --git a/README.ContainerCanary.txt b/README.ContainerCanary.txt
diff --git a/ckan-2.10/base/Dockerfile b/ckan-2.10/base/Dockerfile
@@ -74,7 +74,6 @@ COPY setup/supervisord.conf /etc
 # Install CKAN
 RUN pip3 install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan && \
     cd ${SRC_DIR}/ckan && \
-    cp who.ini ${APP_DIR} && \
     pip3 install --no-binary markdown -r requirements.txt && \
     # Install CKAN envvars to support loading config from environment variables
     pip3 install -e git+https://github.com/okfn/[email protected]#egg=ckanext-envvars && \

diff --git a/ckan-2.11/base/Dockerfile b/ckan-2.11/base/Dockerfile
@@ -47,20 +47,12 @@ RUN apt-get install --no-install-recommends -y \
 # Create the src directory
 RUN mkdir -p ${SRC_DIR}
 
-# Install supervisord and create the supervisord.d directory
-RUN apt-get install --no-install-recommends -y \
-        supervisor && \
-        mkdir /etc/supervisord.d
-
-COPY setup/supervisord.conf /etc
-
 # Install uwsgi, the CKAN application, the dependency packages for CKAN plus some confiquration
 RUN pip3 install -U pip && \
     pip3 install uwsgi && \
     cd ${SRC_DIR} && \
     pip3 install -e git+${GIT_URL}@${CKAN_VERSION}#egg=ckan && \
     cd ckan && \
-    cp who.ini ${APP_DIR} && \
     pip3 install --no-binary markdown -r requirements.txt && \
     # Install CKAN envvars to support loading config from environment variables
     pip3 install -e git+https://github.com/okfn/[email protected]#egg=ckanext-envvars && \
@@ -85,6 +77,4 @@ ONBUILD RUN mkdir /docker-entrypoint.d
 
 EXPOSE 5000
 
-HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit CMD ["/srv/app/start_ckan.sh"]
-
 CMD ["/srv/app/start_ckan.sh"]
diff --git a/ckan-2.11/base/setup/start_ckan.sh b/ckan-2.11/base/setup/start_ckan.sh
@@ -47,8 +47,6 @@ UWSGI_OPTS="--plugins http,python \
 
 if [ $? -eq 0 ]
 then
-    # Start supervisord
-    supervisord --configuration /etc/supervisord.conf &
     # Start uwsgi
     uwsgi $UWSGI_OPTS
 else

diff --git a/ckan-2.11/base/setup/supervisord.conf b/ckan-2.11/base/setup/supervisord.conf
diff --git a/ckan-2.11/base/setup/uwsgi.conf b/ckan-2.11/base/setup/uwsgi.conf
diff --git a/ckan-master/base/Dockerfile b/ckan-master/base/Dockerfile
@@ -47,13 +47,6 @@ RUN apt-get install --no-install-recommends -y \
 # Create the src directory
 RUN mkdir -p ${SRC_DIR}
 
-# Install supervisord and create the supervisord.d directory
-RUN apt-get install --no-install-recommends -y \
-        supervisor && \
-        mkdir /etc/supervisord.d
-
-COPY setup/supervisord.conf /etc
-
 # Install uwsgi, the CKAN application, the dependency packages for CKAN plus some confiquration
 RUN pip3 install -U pip && \
     pip3 install uwsgi && \
@@ -84,6 +77,4 @@ ONBUILD RUN mkdir /docker-entrypoint.d
 
 EXPOSE 5000
 
-HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit CMD ["/srv/app/start_ckan.sh"]
-
 CMD ["/srv/app/start_ckan.sh"]
diff --git a/ckan-master/base/setup/start_ckan.sh b/ckan-master/base/setup/start_ckan.sh
@@ -47,8 +47,6 @@ UWSGI_OPTS="--plugins http,python \
 
 if [ $? -eq 0 ]
 then
-    # Start supervisord
-    supervisord --configuration /etc/supervisord.conf &
     # Start uwsgi
     uwsgi $UWSGI_OPTS
 else

diff --git a/ckan-master/base/setup/supervisord.conf b/ckan-master/base/setup/supervisord.conf
diff --git a/ckan-master/base/setup/uwsgi.conf b/ckan-master/base/setup/uwsgi.conf