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

Updates to CKAN 2.11 and master images (remove supervisor and tidy up) #77

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Updates to CKAN 2.11 and master images (remove supervisor and tidy up) #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file removed ContainerCanary/canary_darwin_amd64
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion ContainerCanary/canary_darwin_amd64.sha256sum
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions ContainerCanary/ckan.yaml
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions README.ContainerCanary.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ckan-2.10/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,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/ckanext-envvars.git#egg=ckanext-envvars && \
Expand Down
10 changes: 0 additions & 10 deletions ckan-2.11/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/ckanext-envvars.git#egg=ckanext-envvars && \
Expand All @@ -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"]
2 changes: 0 additions & 2 deletions ckan-2.11/base/setup/start_ckan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 0 additions & 23 deletions ckan-2.11/base/setup/supervisord.conf
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ckan-2.11/base/setup/uwsgi.conf
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions ckan-master/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/ckanext-envvars.git#egg=ckanext-envvars && \
Expand All @@ -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"]
2 changes: 0 additions & 2 deletions ckan-master/base/setup/start_ckan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 0 additions & 23 deletions ckan-master/base/setup/supervisord.conf
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ckan-master/base/setup/uwsgi.conf
View file
Open in desktop

This file was deleted.