fix(registry): python workaround for ssl connections if > 2.7.8

Author: aledbf

builder/image/etc/ssh/sshd_config

@@ -23,6 +23,7 @@ X11Forwarding no
 X11DisplayOffset 10
 PrintMotd no
 PrintLastLog yes
+TCPKeepAlive yes
 #AcceptEnv LANG LC_*
 Subsystem sftp /usr/lib/openssh/sftp-server
 UseDNS no

database/bin/boot

@@ -60,9 +60,9 @@ done
 
 # initialize database if one doesn't already exist
 # for example, in the case of a data container
-if [[ ! -d /var/lib/postgresql/main ]]; then
+if [[ ! -d /var/lib/postgresql/9.3/main ]]; then
 	chown -R postgres:postgres /var/lib/postgresql
-	sudo -u postgres /usr/bin/initdb -D /var/lib/postgresql/main
+	sudo -u postgres /usr/bin/initdb -D /var/lib/postgresql/9.3/main
 fi
 
 # ensure WAL log bucket exists
@@ -71,24 +71,24 @@ INIT_ID=$(etcdctl get $ETCD_PATH/initId 2> /dev/null || echo none)
 echo "database: expecting initialization id: $INIT_ID"
 
 initial_backup=0
-if [[ "$(cat /var/lib/postgresql/main/initialized 2> /dev/null)" != "$INIT_ID" ]]; then
+if [[ "$(cat /var/lib/postgresql/9.3/main/initialized 2> /dev/null)" != "$INIT_ID" ]]; then
   echo "database: no existing database found or it is outdated."
   # check if there are any backups -- if so, let's restore
   # we could probably do better than just testing number of lines -- one line is just a heading, meaning no backups
   if [[ `envdir /etc/wal-e.d/env wal-e --terse backup-list | wc -l` -gt "1" ]]; then
     echo "database: restoring from backup..."
-    rm -rf /var/lib/postgresql/main
-    sudo -u postgres envdir /etc/wal-e.d/env wal-e backup-fetch /var/lib/postgresql/main LATEST
-    chown -R postgres:postgres /var/lib/postgresql/main
-    chmod 0700 /var/lib/postgresql/main
-    echo "restore_command = 'envdir /etc/wal-e.d/env wal-e wal-fetch \"%f\" \"%p\"'" | sudo -u postgres tee /var/lib/postgresql/main/recovery.conf >/dev/null
+    rm -rf /var/lib/postgresql/9.3/main
+    sudo -u postgres envdir /etc/wal-e.d/env wal-e backup-fetch /var/lib/postgresql/9.3/main LATEST
+    chown -R postgres:postgres /var/lib/postgresql/9.3/main
+    chmod 0700 /var/lib/postgresql/9.3/main
+    echo "restore_command = 'envdir /etc/wal-e.d/env wal-e wal-fetch \"%f\" \"%p\"'" | sudo -u postgres tee /var/lib/postgresql/9.3/main/recovery.conf >/dev/null
   else
     echo "database: no backups found. Initializing a new database..."
     initial_backup=1
   fi
   # either way, we mark the database as initialized
   INIT_ID=$(cat /proc/sys/kernel/random/uuid)
-  echo $INIT_ID > /var/lib/postgresql/main/initialized
+  echo $INIT_ID > /var/lib/postgresql/9.3/main/initialized
   etcdctl --no-sync -C $ETCD set $ETCD_PATH/initId $INIT_ID >/dev/null
 else
   echo "database: existing data directory found. Starting postgres..."
@@ -122,7 +122,7 @@ sleep 1 && while [[ -z $(netstat -lnt | awk "\$6 == \"LISTEN\" && \$4 ~ \".5432\
 if [[ "${initial_backup}" == "1" ]] ; then
   echo "database: performing an initial backup..."
   # perform an initial backup
-  sudo -u postgres envdir /etc/wal-e.d/env wal-e backup-push /var/lib/postgresql/main
+  sudo -u postgres envdir /etc/wal-e.d/env wal-e backup-push /var/lib/postgresql/9.3/main
 fi
 
 echo "database: postgres is running..."
@@ -148,11 +148,11 @@ if [[ ! -z $EXTERNAL_PORT ]]; then
     # we really need cron :(
     if [[ "${count}" -ge "${BACKUP_FREQUENCY}" ]] ; then
       echo "database: performing a backup..."
-      if [[ -f /var/lib/postgresql/main/recovery.conf ]] ; then
+      if [[ -f /var/lib/postgresql/9.3/main/recovery.conf ]] ; then
         echo "database: database is currently recovering from a backup. Will try again next loop..."
       else
         # perform a backup
-        sudo -u postgres envdir /etc/wal-e.d/env wal-e backup-push /var/lib/postgresql/main
+        sudo -u postgres envdir /etc/wal-e.d/env wal-e backup-push /var/lib/postgresql/9.3/main
         # only retain the latest BACKUPS_TO_RETAIN backups
         sudo -u postgres envdir /etc/wal-e.d/env wal-e delete --confirm retain ${BACKUPS_TO_RETAIN}
         count=0

database/templates/postgresql.conf

@@ -38,7 +38,7 @@
 # The default values of these variables are driven from the -D command-line
 # option or PGDATA environment variable, represented here as ConfigDir.
 
-data_directory = '/var/lib/postgresql/main'		# use data in another directory
+data_directory = '/var/lib/postgresql/9.3/main'		# use data in another directory
 					# (change requires restart)
 hba_file = '/etc/postgresql/main/pg_hba.conf'	# host-based authentication file
 					# (change requires restart)

registry/build.sh

@@ -14,21 +14,25 @@ fi
 apk add --update-cache \
   build-base \
   git \
-  libevent-dev \
   openssl-dev \
   python-dev \
+  libffi-dev \
   swig \
+  libevent-dev \
   xz-dev
 
 # install pip
 curl -sSL https://raw.githubusercontent.com/pypa/pip/6.1.1/contrib/get-pip.py | python -
 
+# workaround to python > 2.7.8 SSL issues
+pip install pyopenssl ndg-httpsclient pyasn1
+
 # create a registry user
 adduser -D -s /bin/bash registry
 
 # add the docker registry source from github
 git clone -b new-repository-import-v091 --single-branch https://github.com/deis/docker-registry /docker-registry && \
-    chown -R registry:registry /docker-registry
+  chown -R registry:registry /docker-registry
 
 # install boto configuration
 cp /docker-registry/config/boto.cfg /etc/boto.cfg
@@ -49,4 +53,5 @@ apk del --purge \
   build-base \
   linux-headers \
   python-dev
+
 rm -rf /var/cache/apk/*

tests/fixtures/test-etcd/Dockerfile

@@ -11,7 +11,7 @@ RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdem
 RUN buildDeps='curl git-core'; \
     set -x; \
     apt-get update && apt-get install -y $buildDeps --no-install-recommends \
-    && curl -sSL https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar -C /usr/local -xz \
+    && curl -sSL https://storage.googleapis.com/golang/go1.4.1.linux-amd64.tar.gz | tar -C /usr/local -xz \
     && git clone -q https://github.com/coreos/etcd.git /opt/etcd \
     && cd /opt/etcd && git checkout -q v0.4.6 && PATH=/usr/local/go/bin:$PATH ./build \
     && cp /opt/etcd/bin/etcd /usr/local/bin \