* adds git to main images
* fixes timezone issue on 2.7 * minor formatting changes
This commit is contained in:
parent
f7d1fedd15
commit
35b390499a
|
@ -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,6 +151,7 @@ RUN apt-get update && \
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
gettext \
|
gettext \
|
||||||
curl \
|
curl \
|
||||||
|
git \
|
||||||
wget \
|
wget \
|
||||||
gnupg \
|
gnupg \
|
||||||
python \
|
python \
|
||||||
|
@ -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}" && \
|
||||||
|
|
|
@ -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}" && \
|
||||||
|
|
|
@ -153,6 +153,7 @@ RUN apt-get update && \
|
||||||
gettext \
|
gettext \
|
||||||
curl \
|
curl \
|
||||||
libpq5 \
|
libpq5 \
|
||||||
|
git \
|
||||||
postgresql-client \
|
postgresql-client \
|
||||||
python3 \
|
python3 \
|
||||||
python3-distutils \
|
python3-distutils \
|
||||||
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue