build: upgrade postgres 9.6 to 10.10

Author: abbotto

Dockerfile

@@ -1,18 +1,35 @@
-FROM alpine:3.6
+ARG alpine_version
+FROM alpine:${alpine_version}
 
-ARG pg_alpine_branch
-ARG pg_version
+ARG alpine_version
+ARG pg_package_version
 
-# python for aws-cli, for s3 uploading, jq for dealing with AWS Cli
-RUN apk --no-cache add python py-pip jq && \
-	pip install awscli && \
-	apk --purge -v del py-pip
+#--------------------------------------------------------------------------------
+# Install dependencies
+#--------------------------------------------------------------------------------
+# "postgresql" is required for "pg_restore"
+# "py-pip" is required for "aws-cli"
+#--------------------------------------------------------------------------------
+RUN echo "http://dl-cdn.alpinelinux.org/alpine/v${alpine_version}/main" >> /etc/apk/repositories
 
-# postgresql for pg_dump
-RUN echo "http://dl-cdn.alpinelinux.org/alpine/${pg_alpine_branch}/main" >> /etc/apk/repositories
-RUN echo ${pg_version}; apk --no-cache add postgresql=${pg_version}
+RUN apk --no-cache --update add dumb-init postgresql=${pg_package_version} curl python3 && \
+	curl https://bootstrap.pypa.io/get-pip.py | python3 && \
+	pip install awscli && \
+	rm -f /usr/bin/pip && \
+	apk --purge -v del curl
 
+#--------------------------------------------------------------------------------
+# Set script permissions and create required directories
+#--------------------------------------------------------------------------------
 COPY action.sh /
 RUN chmod +x action.sh
 
+#--------------------------------------------------------------------------------
+# Use the `dumb-init` init system (PID 1) for process handling
+#--------------------------------------------------------------------------------
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+
+#--------------------------------------------------------------------------------
+# Configure and apply a cronjob
+#--------------------------------------------------------------------------------
 CMD echo "${CRON_MINUTE:-$(shuf -i 0-59 -n1)} ${CRON_HOUR:-*} * * * /action.sh" > /var/spool/cron/crontabs/root && crond -d 8 -f

build_push.sh

@@ -1,23 +1,31 @@
-#! /bin/sh
+#!/usr/bin/env sh
 
-builds=$(echo '
-9.6.10     9.6.10-r0   v3.6
-#9.6.3     9.6.3-r0    v3.6
-9.6        9.6.10-r0   v3.6
-9          9.6.10-r0   v3.6
-latest     9.6.10-r0   v3.6
-#9.5.7     9.5.7-r0    v3.4
-#9.5       9.5.7-r0    v3.4
-' | grep -v '^#' | tr -s ' ')
+alpine_version='3.8'
+legacy_image=false
+pg_major_version='10'
+pg_package_version='10.10'
 
-IFS=$'\n'
-for build in $builds; do
-  tag=$(echo $build | cut -d ' ' -f 1 )
-  pgVersion=$(echo $build | cut -d ' ' -f 2)
-  pgAlpineBranch=$(echo $build | cut -d ' ' -f 3)
-  
-  echo docker build --tag bluedrop360/postgres-dump-to-s3:$tag --build-arg pg_version="$pgVersion" --build-arg pg_alpine_branch=$pgAlpineBranch .
-  eval docker build --tag bluedrop360/postgres-dump-to-s3:$tag --build-arg pg_version="$pgVersion" --build-arg pg_alpine_branch=$pgAlpineBranch .
-  echo docker push bluedrop360/postgres-dump-to-s3:$tag
-  eval docker push bluedrop360/postgres-dump-to-s3:$tag
+builds=\
+"${pg_package_version}_${pg_package_version}-r0_${alpine_version}",\
+"${pg_major_version}_${pg_package_version}-r0_${alpine_version}"
+
+if [ "${legacy_image}" = 'false' ]; then
+  builds="${builds}","latest_${pg_package_version}-r0_${alpine_version}"
+fi
+
+echo $builds | tr ',' '\n' | while read build; do
+  alpine_version=$(echo "${build}" | cut -d '_' -f 3)
+  pg_dump_to_s3_tag=$(echo "${build}" | cut -d '_' -f 1 )
+  pg_package_version=$(echo "${build}" | cut -d '_' -f 2)
+
+  echo ""
+  echo "--------------------------------"
+  echo "POSTGRES-DUMP-TO-S3 TAG: ${pg_dump_to_s3_tag}"
+  echo "POSTGRES PACKAGE VERSION: ${pg_package_version}"
+  echo "--------------------------------"
+
+  echo docker build --tag bluedrop360/postgres-dump-to-s3:$pg_dump_to_s3_tag --build-arg pg_package_version=$pg_package_version --build-arg alpine_version="${alpine_version}" .
+  eval docker build --tag bluedrop360/postgres-dump-to-s3:$pg_dump_to_s3_tag --build-arg pg_package_version=$pg_package_version --build-arg alpine_version="${alpine_version}" . || exit 1
+  echo docker push bluedrop360/postgres-dump-to-s3:$pg_dump_to_s3_tag
+  eval docker push bluedrop360/postgres-dump-to-s3:$pg_dump_to_s3_tag || exit 1
 done