CatalogueRevamping
/
docker-ckan
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* adds git to main images 

* fixes timezone issue on 2.7
* minor formatting changes
This commit is contained in:
blagoja.stojkoski 2020-12-02 15:06:37 +01:00
parent f7d1fedd15
commit 35b390499a
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
images/ckan/2.7/Dockerfile.focal
View File

@ -34,8 +34,8 @@ RUN apt-get install -y \
# Packages to build CKAN requirements and plugins # Packages to build CKAN requirements and plugins
RUN apt-get install -y \ RUN apt-get install -y \
git \ git \
wget \ wget \
gnupg \ gnupg \
curl \ curl \
python \ python \
linux-headers-generic \ linux-headers-generic \
@ -122,6 +122,10 @@ FROM ubuntu:focal-20201106
MAINTAINER Keitaro Inc <info@keitaro.com> MAINTAINER Keitaro Inc <info@keitaro.com>
# Set timezone
ENV TZ=UTC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Set Locale # Set Locale
ENV LC_ALL=en_US.UTF-8 ENV LC_ALL=en_US.UTF-8
@ -147,8 +151,9 @@ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
gettext \ gettext \
curl \ curl \
wget \ git \
gnupg \ wget \
gnupg \
python \ python \
libpython2.7 \ libpython2.7 \
libmagic1 \ libmagic1 \
@ -192,8 +197,6 @@ RUN pip install -e /srv/app/src/ckan && \
# Install default CKAN extensions # Install default CKAN extensions
pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \ pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \
# Create and update CKAN config # Create and update CKAN config
# Set timezone
echo "UTC" > /etc/timezone && \
# Generate CKAN config # Generate CKAN config
paster --plugin=ckan make-config ckan ${APP_DIR}/production.ini && \ paster --plugin=ckan make-config ckan ${APP_DIR}/production.ini && \
paster --plugin=ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}" && \ paster --plugin=ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}" && \

3
images/ckan/2.8/Dockerfile.focal
View File

@ -143,6 +143,7 @@ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
gettext \ gettext \
curl \ curl \
git \
libpq5 \ libpq5 \
postgresql-client \ postgresql-client \
python \ python \
@ -181,8 +182,6 @@ RUN pip install -e /srv/app/src/ckan && \
# Install default CKAN extensions # Install default CKAN extensions
pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \ pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \
# Create and update CKAN config # Create and update CKAN config
# Set timezone
echo "UTC" > /etc/timezone && \
# Generate CKAN config # Generate CKAN config
paster --plugin=ckan make-config ckan ${APP_DIR}/production.ini && \ paster --plugin=ckan make-config ckan ${APP_DIR}/production.ini && \
paster --plugin=ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}" && \ paster --plugin=ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}" && \

23
images/ckan/2.9/Dockerfile.focal
View File

@ -38,12 +38,12 @@ RUN apt-get install -y \
python3 \ python3 \
libpq-dev \ libpq-dev \
linux-headers-generic \ linux-headers-generic \
gcc-10 \ gcc-10 \
make \ make \
g++-10 \ g++-10 \
autoconf \ autoconf \
automake \ automake \
libtool \ libtool \
patch \ patch \
libpcre3-dev \ libpcre3-dev \
libpcre3 \ libpcre3 \
@ -151,12 +151,13 @@ WORKDIR ${APP_DIR}
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
gettext \ gettext \
curl \ curl \
libpq5 \ libpq5 \
postgresql-client \ git \
postgresql-client \
python3 \ python3 \
python3-distutils \ python3-distutils \
libpython3.8 \ libpython3.8 \
libmagic1 \ libmagic1 \
libpcre3 \ libpcre3 \
libxslt1.1 \ libxslt1.1 \
@ -193,8 +194,6 @@ RUN pip install -e /srv/app/src/ckan && \
# Install default CKAN extensions # Install default CKAN extensions
pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \ pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \
# Create and update CKAN config # Create and update CKAN config
# Set timezone
echo "UTC" > /etc/timezone && \
# Generate CKAN config # Generate CKAN config
ckan generate config ${APP_DIR}/production.ini && \ ckan generate config ${APP_DIR}/production.ini && \
# Configure plugins # Configure plugins