* adds git to main images

* fixes timezone issue on 2.7
* minor formatting changes

images/ckan/2.7/Dockerfile.focal

@@ -122,6 +122,10 @@ FROM ubuntu:focal-20201106
 
 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
 ENV LC_ALL=en_US.UTF-8
 
@@ -147,6 +151,7 @@ RUN apt-get update && \
     apt-get install -y \
         gettext \
         curl \
+        git \
 	    wget \
 	    gnupg \
         python \
@@ -192,8 +197,6 @@ RUN pip install -e /srv/app/src/ckan && \
     # Install default CKAN extensions
     pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \
     # Create and update CKAN config
-    # Set timezone
-    echo "UTC" >  /etc/timezone && \
     # Generate CKAN config
     paster --plugin=ckan make-config ckan ${APP_DIR}/production.ini && \
     paster --plugin=ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}" && \

images/ckan/2.8/Dockerfile.focal

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

images/ckan/2.9/Dockerfile.focal

@@ -153,6 +153,7 @@ RUN apt-get update && \
         gettext \
 	    curl \
         libpq5 \
+        git \
 	    postgresql-client \
         python3 \
 	    python3-distutils \
@@ -193,8 +194,6 @@ RUN pip install -e /srv/app/src/ckan && \
     # Install default CKAN extensions
     pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \
     # Create and update CKAN config
-    # Set timezone
-    echo "UTC" >  /etc/timezone && \
     # Generate CKAN config
     ckan generate config ${APP_DIR}/production.ini && \
     # Configure plugins