Re-structure code to support multiple python version

Author: thuandt

.dockerignore

@@ -1,5 +1,4 @@
 FROM python:2.7
-MAINTAINER Inspectorio DevOps <devops@inspectorio.com>
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG PIP_NO_CACHE_DIR=1
@@ -11,19 +10,23 @@ ENV APP_HOME  /app
 ENV APP_SHELL /bin/bash
 ENV NGINX_WORKER 4
 
-ONBUILD ADD . "${APP_HOME}"
-ONBUILD ADD config /etc
-ONBUILD WORKDIR "${APP_HOME}"
+ONBUILD COPY . ${APP_HOME}
+ONBUILD COPY config /etc
+ONBUILD WORKDIR ${APP_HOME}
+ONBUILD RUN chmod a+x "${APP_HOME}/entrypoint.sh"
 
 COPY requirements.txt /tmp/requirements.txt
 COPY entrypoint.sh /tmp/entrypoint.sh
 COPY config /etc/
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 RUN groupadd "${APP_GRP}" \
 &&  groupadd supervisor \
 &&  useradd --create-home --home-dir "${APP_HOME}" --shell "${APP_SHELL}" --gid "${APP_GRP}" "${APP_USER}" \
 &&  usermod -a -G supervisor "${APP_USER}" \
 &&  mv /tmp/entrypoint.sh "${APP_HOME}/entrypoint.sh" \
+&&  chmod a+x "${APP_HOME}/entrypoint.sh" \
 &&  chown -R "${APP_USER}":"${APP_GRP}" "${APP_HOME}" \
 &&  apt-get -qq -y update \
 &&  apt-get install -qq -o Dpkg::Options::="--force-confold" \

Dockerfile renamed to 2.7/Dockerfile

@@ -0,0 +1,51 @@
+FROM python:3.6
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG PIP_NO_CACHE_DIR=1
+ARG PIP_CACHE_DIR=/tmp/
+
+ENV APP_USER  app
+ENV APP_GRP   app
+ENV APP_HOME  /app
+ENV APP_SHELL /bin/bash
+ENV NGINX_WORKER 4
+
+ONBUILD COPY . ${APP_HOME}
+ONBUILD COPY config /etc
+ONBUILD WORKDIR ${APP_HOME}
+ONBUILD RUN chmod a+x "${APP_HOME}/entrypoint.sh"
+
+COPY requirements.txt /tmp/requirements.txt
+COPY entrypoint.sh /tmp/entrypoint.sh
+COPY config /etc/
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN groupadd "${APP_GRP}" \
+&&  groupadd supervisor \
+&&  useradd --create-home --home-dir "${APP_HOME}" --shell "${APP_SHELL}" --gid "${APP_GRP}" "${APP_USER}" \
+&&  usermod -a -G supervisor "${APP_USER}" \
+&&  mv /tmp/entrypoint.sh "${APP_HOME}/entrypoint.sh" \
+&&  chmod a+x "${APP_HOME}/entrypoint.sh" \
+&&  chown -R "${APP_USER}":"${APP_GRP}" "${APP_HOME}" \
+&&  apt-get -qq -y update \
+&&  apt-get install -qq -o Dpkg::Options::="--force-confold" \
+                    -y --no-install-recommends \
+                    supervisor curl jq vim-nox openssh-client \
+                    moreutils gettext-base locales tzdata lsb-release \
+&&  curl -sSL http://nginx.org/keys/nginx_signing.key | apt-key add - \
+&&  echo "deb http://nginx.org/packages/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ $(lsb_release -cs) nginx" > /etc/apt/sources.list.d/nginx.list \
+&&  apt-get -qq -y update \
+&&  apt-get -qq -o Dpkg::Options::="--force-confold" -y install nginx \
+&&  /bin/rm -f /etc/nginx/nginx.conf.dpkg-dist /etc/supervisor/supervisord.conf.dpkg-dist \
+&&  ln -sf /dev/stdout /var/log/nginx/access.log \
+&&  ln -sf /dev/stderr /var/log/nginx/error.log \
+&&  rm -f /etc/nginx/conf.d/* /etc/nginx/sites-enabled/* \
+&&  pip install --no-cache-dir -U -r /tmp/requirements.txt \
+&&  apt-get clean \
+&&  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+WORKDIR /app
+
+EXPOSE 5000
+CMD ["/app/entrypoint.sh"]

config/nginx/nginx.conf renamed to 2.7/config/nginx/nginx.conf

@@ -0,0 +1,83 @@
+user ${APP_USER};
+worker_processes ${NGINX_WORKER};
+
+error_log  /dev/stderr warn;
+pid        /var/run/nginx.pid;
+events {
+    worker_connections 2048;
+    use epoll;
+    multi_accept on;
+}
+
+worker_rlimit_nofile 8192;
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    # recursive real ip
+    set_real_ip_from 10.0.0.0/8;
+    set_real_ip_from 172.0.0.0/8;
+    set_real_ip_from 192.0.0.0/8;
+    set_real_ip_from 127.0.0.1;
+    real_ip_header    X-Forwarded-For;
+    real_ip_recursive on;
+
+    log_format main '$http_host ' '$remote_addr [$time_local] '
+                    '"$request" $status $body_bytes_sent '
+                    '"$http_referer" "$http_user_agent" "$http_x_forwarded_for" '
+                    '$request_time ' '$upstream_response_time ' 'upstream: $upstream_addr';
+
+    log_format json '{"@type": "nginx", '
+                    '"http_host": "$http_host", '
+                    '"remote_addr": "$remote_addr", '
+                    '"time_local": "$time_local", '
+                    '"request": "$request", '
+                    '"status": "$status", '
+                    '"body_bytes_sent": "$body_bytes_sent", '
+                    '"http_referer": "$http_referer", '
+                    '"http_user_agent": "$http_user_agent", '
+                    '"http_x_forwarded_for": "$http_x_forwarded_for", '
+                    '"http_x_request_id": "$http_x_request_id", '
+                    '"request_time": "$request_time", '
+                    '"upstream_response_time": "$upstream_response_time", '
+                    '"upstream_addr": "$upstream_addr" }';
+
+    access_log  /dev/stdout  json;
+
+    sendfile        on;
+    tcp_nopush     on;
+
+    keepalive_timeout  75s;
+    fastcgi_connect_timeout 75s;
+
+    lingering_time 75s;
+    lingering_timeout 15s;
+
+    ### Buffer Size
+    ## If buffer sizes are low, Nginx write to a temporary file. cause excessive disk I/O
+    client_body_buffer_size      128k;
+    client_max_body_size         2m;
+    client_header_buffer_size    1k;
+    large_client_header_buffers  4 4k;
+    ## number and size of the buffers used for reading a response from a disk
+    output_buffers               1 32k;
+    postpone_output              1460;
+    ## cache 1000 files for 30 seconds, excluding old files not accessed in 20 secs
+    open_file_cache max=1000 inactive=10s;
+    open_file_cache_valid 20s;
+    open_file_cache_min_uses 5;
+    open_file_cache_errors off;
+
+    gzip on;
+    gzip_comp_level 1;
+    gzip_min_length 100;
+    gzip_types application/json application/javascript text/css;
+    gzip_vary on;
+
+    add_header X-Frame-Options SAMEORIGIN;
+    add_header X-XSS-Protection "1; mode=block";
+    add_header Strict-Transport-Security "max-age=2592000; includeSubDomains";
+    server_tokens off;
+
+    include /etc/nginx/conf.d/*.conf;
+}

config/supervisor/supervisord.conf renamed to 2.7/config/supervisor/supervisord.conf

@@ -0,0 +1,32 @@
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0770
+chown=root:supervisor
+
+[supervisord]
+user=root
+nodaemon=true
+logfile=/dev/null
+logfile_maxbytes=0
+pidfile=/var/run/supervisord.pid
+childlogdir=/var/log/supervisor
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[program:nginx]
+command=/usr/sbin/nginx -g 'daemon off;'
+autostart=true
+autorestart=true
+stdout_events_enabled=true
+stderr_events_enabled=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[include]
+files = /etc/supervisor/conf.d/*.conf

entrypoint.sh renamed to 2.7/entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# Filename: entrypoint.sh
+# Description: Docker entrypoint script for Inspectorio Python base image
+
+set -euxo pipefail
+
+# shellcheck disable=SC2016
+envsubst '${APP_USER} ${NGINX_WORKER}' < /etc/nginx/nginx.conf | sponge /etc/nginx/nginx.conf
+
+exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf