[0.3.2][] - 2017-12-20

-   Made plugins fail with non-zero status for backup errors
-   Bumped Python from `2.7.13` to `2.7.14`
-   Switched to modern multi-stage build process

Author: leonsp

.env.example

@@ -3,9 +3,9 @@
 export REGISTRY_HOST="bigdatauniversity/"
 export REPO="bigdatauniversity/portals.gamora"
 
-export PIP_REPO_HOST=""
 export PIP_REPO_USERNAME=""
 export PIP_REPO_PASSWORD=""
+export PIP_REPO_HOST_WITH_CREDS="https://${PIP_REPO_USERNAME:?}:${PIP_REPO_PASSWORD:?}@na.artifactory.swg-devops.com/artifactory/api/pypi/apset-pypi-local/simple"
 
 export BACKUP_LOCAL_PATHS="/etc /var"
 

.travis.yml

@@ -1,7 +1,7 @@
 language: bash
 services: docker
 env:
-  secure: '09SaplMYjic0hl8paSF/OQO6CS1AA8alhaePsJsS0uIA3Lp8CMoXd6enZFtjrKzHNhue4xZhEkCtpVyvS4Hnfd4oimti18ZWEMgrMrHWnJmv+dDXWj5ElsNsQ8mSlZ3Aw090J5Rfy+zSuokL0gAtaYG1CJw2++BE1lvN4wJjXaOz0X+I+5sSWIjjHPYoGHwSJ1LrCgMK877siLQs1931quZLjx3D1iqy0/BRN5Luca4tCBpKaon34YzYBBDzhwlWtCryfyVbZjKGmucD0eT7NtH8Z3UuB1esHijVxnSWg9YuaB0Ntsqwrk1hSNARznaG/WLtUDV/Ov7BZPCv7ezWABqyEna8pHc139xLTytW4bXX3UT3imOZYjhk5+Anm8Pg88dis7O+YjbJ0jR8ROQRyqOVs6DV4x7cJHngToQsTdIvAL4Ukuq10Km4r5u/DYmBIlG7F8YePhJ3wkW2NF0J0wTarJXh6/VoOi8f6B/6g4rOOX+3xq8WGxdxW4yiOK6zknpBVY7tVG+f9NWDblOKRF9pj+Ruga9pDkRCooTqvXyUff4/Q3xW697QeHTwE9WlBJ9JQ9pzJdY7fDEsUT0MKwDcy0rMZL8GaFHLV+KqYv9nrgxElv/BRm6rqXRqny/AlwIEDh7TQnrJec23Q9FCcnW5CjOxFgL+1vqKM1mi+CM='
+  secure: ze2FTRga9GfaCjgbWqMDt0d+ni8JRMvyV2BXtUiocMxgmdpULhOt5grjgtyVKSdPwz7ZIh28zdDu4mooKrDlG5wjRuuAMR1Cp1UYm8cIjgyIMwGdzQWIH1G99h0/w9UUdTTahNVAZNxeFkov8zIXKhaTDuG7qhsW9Deu7hrUCyk6aRWJJo2c6hvSusMi4IYvOP5wZunEvmC6fzxxM9bQhtflke9GL0qVB7w0E4i/5gQKbnzGzeoZ6az1B0rSNnAhXoyd4AcodMoI77zXZ/ZLSijuGfpeUu4/RyMBBVKLmaD57pQADiL4EnPy0cv8iw9o3+iEjEiQr1us5nFIECL+Ok4pgeyk0O+nXzmrsTXQJcgvGoCB99fB5YRVNB5sx+6UIfi/CPLb0NAsDuioU/J6FkkYftc2RMPFcj4cUs/3Zo1UhIKZWPMsZl2eHKulgTYp0MCG9CmyzGTljebciutThGrmEGtEMqPDK+qDeb2XJ5grxAcYCWRfKi5KFYyiEEdl/kF7Qw+fLyBMvM8X02cbJBrELwArjN1cCHkQSANHYwi7i+ZwIAfOonqG1I5JSG8XclcG//XH6y4buSAbaGDxfX3NEdwYcNv5D63mh9H9ywOVP0mnxFhzacvgzg3tCgYqqdgsG860/fPsvD+dwQGuwYvTomNoZw3Kb8r2ATc53Jk=
 addons:
   apt:
     packages:

CHANGELOG.md

@@ -6,16 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][]
 
-## [0.3.3][] - 2017-12-19
-### Fixed
--   Python image `python:2.7.14-alpine3.7` is missing. Opened issue:
-    <https://github.com/docker-library/python/issues/252>
-
-## [0.3.2][] - 2017-12-19
+## [0.3.2][] - 2017-12-20
 ### Fixed
 -   Made plugins fail with non-zero status for backup errors
 -   Bumped Python from `2.7.13` to `2.7.14`
--   Bumped Alpine from `3.6` to `3.7`
+-   Switched to modern multi-stage build process
 
 ## [0.3.1][] - 2017-07-17
 ### Fixed

bin/build

@@ -5,25 +5,4 @@ set -e
 # Exit immediately if a command accesses an undeclared variable
 set -u
 
-ROOT_DIR="$(dirname "$(realpath "$0")")/.."
-GAMORA_DIR="$ROOT_DIR/gamora"
-
-GAMORA_BUILD_FILE="$GAMORA_DIR/build.tgz"
-
-# Print commands and their arguments as they are executed.
-set -x
-
-# Remove GLaDOS build file, if one exists.
-if [ -f "$GAMORA_BUILD_FILE" ]; then rm -vf $GAMORA_BUILD_FILE; fi
-
-# Prepare build image.
-docker-compose -f $ROOT_DIR/docker-compose.build.yaml build
-
-# Prepare GLaDOS bundle.
-docker run --rm portal.gamora-build > $GAMORA_BUILD_FILE
-
-# # Prepare distribution image.
-# if [ "$CI" == true ]; then
-#   cp $ROOT_DIR/chell.env{.example,}
-# fi
-docker-compose -f $ROOT_DIR/docker-compose.yaml build
+docker-compose build

bin/push

@@ -11,14 +11,7 @@ fi
 
 docker images
 
-# Why was the code assuming that $REPO:$TAG exists
-# while $REPO:latest doesn't and not vice versa?
-
-docker tag $REPO:latest $REPO:$TAG
-docker push $REPO:$TAG
-
-echo "Updating latest tag"
-docker push $REPO:latest
+docker-compose push
 
 if [ -z "$REGISTRY_HOST" ] || [[ "$REGISTRY_HOST" == *"docker.io"* ]]; then
   docker logout

ci/README.md

@@ -4,7 +4,7 @@ The following commands were used to configure CI with Travis (one-time setup).
 
 ```shell
 travis encrypt \
-  PIP_REPO_HOST_WITH_CREDS="https://na.artifactory.swg-devops.com/artifactory/api/pypi/apset-pypi-local" \
+  PIP_REPO_HOST_WITH_CREDS="" \
   PIP_REPO_USERNAME="" \
   PIP_REPO_PASSWORD="" \
   --add env

docker-compose.build.yaml

@@ -5,14 +5,14 @@ services:
   # Gamora
   #
   gamora:
-    build: ./gamora
-    image: bigdatauniversity/portal.gamora
+    build:
+      context: ./gamora
+      args:
+        - PIP_REPO_HOST_WITH_CREDS
+        - PIP_REPO_USERNAME
+        - PIP_REPO_PASSWORD
+    image: bigdatauniversity/portal.gamora:$TAG
     environment:
-      # development purposes only
-      - PIP_REPO_HOST_WITH_CREDS
-      - PIP_REPO_USERNAME
-      - PIP_REPO_PASSWORD
-
       - MYSQL_HOST=mysql
       - MYSQL_PORT=3306
       - MYSQL_USER
@@ -33,11 +33,21 @@ services:
       - mysql
       - mongo
 
+  latest:
+    build:
+      context: ./gamora
+      args:
+        - PIP_REPO_HOST_WITH_CREDS
+        - PIP_REPO_USERNAME
+        - PIP_REPO_PASSWORD
+    image: bigdatauniversity/portal.gamora:latest
+    command: "bash -c 'sleep 3600'"
+
   ##
   # MySQL
   ##
   mysql:
-    image: mysql:5.7.18
+    image: mysql:5.7.20
     environment:
       - MYSQL_ROOT_PASSWORD
       - MYSQL_DATABASE

docker-compose.yaml

@@ -1,6 +1,62 @@
-# Always specify the point version
-FROM python:2.7.14-alpine3.6
-MAINTAINER [email protected]
+#####################
+#####################
+# Stage 1: Packages
+#####################
+#####################
+FROM python:2.7.14-alpine3.7 as packages
+LABEL maintainer="[email protected]"
+
+# Install database clients
+# Apply security patches
+RUN echo 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
+    && echo 'http://dl-3.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
+    && apk add --no-cache \
+        bash \
+        libressl \
+        mariadb-client \
+        mongodb-tools \
+        postgresql
+
+ARG PIP_REPO_HOST_WITH_CREDS
+ARG PIP_REPO_USERNAME
+ARG PIP_REPO_PASSWORD
+
+RUN [[ -n "${PIP_REPO_HOST_WITH_CREDS:?}" ]] \
+  && [[ -n "${PIP_REPO_USERNAME:?}" ]] \
+  && [[ -n "${PIP_REPO_PASSWORD:?}" ]]
+
+RUN mkdir /root/.pip
+
+RUN printf "[global]\n\
+index-url = https://pypi.python.org/simple\n\
+extra-index-url = %s\n\
+" "$PIP_REPO_HOST_WITH_CREDS" > /root/.pip/pip.conf
+
+RUN printf "[distutils]\n\
+index-servers = local\n\
+\n\
+[local]\n\
+repository:%s\n\
+username:%s\n\
+password:%s\n\
+" "$PIP_REPO_HOST_WITH_CREDS" "$PIP_REPO_USERNAME" "$PIP_REPO_PASSWORD" \
+  > /root/.pypirc
+
+RUN mkdir -p /gamora /gamora/pip
+WORKDIR /gamora
+
+# install monsoon
+COPY ./requirements.txt ./pip
+RUN pip download --no-input -r ./pip/requirements.txt --dest ./pip \
+    && rm /root/.pypirc /root/.pip/pip.conf
+
+#######################
+#######################
+# Stage 2: Actual Image
+#######################
+#######################
+FROM python:2.7.14-alpine3.7
+LABEL maintainer="[email protected]"
 
 # Install database clients
 # Apply security patches
@@ -12,6 +68,7 @@ RUN echo 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/reposit
         mariadb-client \
         mongodb-tools \
         postgresql \
+        tini \
     && apk add --upgrade --no-cache \
         db \
         expat \
@@ -21,15 +78,17 @@ RUN echo 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/reposit
         ncurses \
         zlib
 
-VOLUME ["/backups"]
-
-# ADD extracts automatically
-# We want the side-effect
-ADD build.tgz /gamora
+##########
+# Gamora
+##########
 WORKDIR /gamora
+COPY --from=packages /gamora .
 
 COPY requirements.txt ./
 RUN pip install -r ./requirements.txt --find-links ./pip
 
 COPY ./docker-entrypoint.sh ./entrypoint.sh
-CMD ["/bin/bash", "/gamora/entrypoint.sh"]
+
+VOLUME ["/backups"]
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["/gamora/entrypoint.sh"]