add 11.7 support and improve scripts

Author: abbotto

.travis.yml

@@ -29,4 +29,4 @@ branches:
     - master
 
 script:
-  - ./lint.sh --sh
+  - ./dev/util/shellcheck.sh

Dockerfile

@@ -2,7 +2,7 @@ ARG alpine_version
 FROM alpine:${alpine_version}
 
 ARG alpine_version
-ARG pg_package_version
+ARG pg_full_version
 
 #--------------------------------------------------------------------------------
 # Install dependencies
@@ -12,7 +12,7 @@ ARG pg_package_version
 #--------------------------------------------------------------------------------
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/v${alpine_version}/main" >> /etc/apk/repositories
 
-RUN apk --no-cache --update add dumb-init postgresql=${pg_package_version} py-pip && \
+RUN apk --no-cache --update add dumb-init postgresql=${pg_full_version} py-pip && \
 	pip install awscli && \
 	apk --purge -v del py-pip
 

README.md

@@ -2,6 +2,25 @@
 
 Cron based download from s3 and database restore.
 
+## Build
+
+`./build_push.sh [-p <FILE>, --package <FILE>]`
+
+`./build_push.sh -p 11.7-3.9`
+
+### Package files
+
+Each package file represents a release for a particular `postgres` branch.
+
+The contents of the latest package file may look like this:
+
+```
+ALPINE_VERSION='3.9'
+PG_BASE_VERSION='11'
+PG_FULL_VERSION='11.7'
+PG_LATEST=true
+```
+
 ## Usage
 
 Typically this image is instantiated as a container among many others and would have the responsibility of getting downloading a dump file from s3 and restoring a database at a particular time of day.

build_push.sh

@@ -1,31 +1,56 @@
 #!/usr/bin/env sh
 
-alpine_version='3.8'
-legacy_image=false
-pg_major_version='10'
-pg_package_version='10.10'
+#------------------------------------------------------------------------------------
+# Loop over arguments
+#------------------------------------------------------------------------------------
+for arg in "$@"; do
+    # [ -p | --package ]
+    if [ -n "${package_flag}" ]; then
+        package_flag=''
+        package="${arg}"
+    fi
+
+    if [ "${arg}" = "-p" ] || [ "${arg}" = "--package" ]; then
+        package_flag=true
+    fi
+done
+
+#------------------------------------------------------------------------------------
+# Exit on error
+#------------------------------------------------------------------------------------
+if [ -z "${package}" ]; then
+  echo '> Package file not specified: [-p <FILE>, --package <FILE>]'
+  exit 127
+fi
+
+if [ -f "./package/${package}.env" ]; then
+  . "./package/${package}.env"
+else
+  echo "> Package file not found: './package/${package}.env'"
+  exit 127
+fi
 
 builds=\
-"${pg_package_version}_${pg_package_version}-r0_${alpine_version}",\
-"${pg_major_version}_${pg_package_version}-r0_${alpine_version}"
+"${PG_FULL_VERSION}_${PG_FULL_VERSION}-r0_${ALPINE_VERSION}",\
+"${PG_BASE_VERSION}_${PG_FULL_VERSION}-r0_${ALPINE_VERSION}"
 
-if [ "${legacy_image}" = 'false' ]; then
-  builds="${builds}","latest_${pg_package_version}-r0_${alpine_version}"
+if [ "${PG_LATEST:-'false'}" = 'true' ]; then
+  builds="${builds}","latest_${PG_FULL_VERSION}-r0_${ALPINE_VERSION}"
 fi
 
 echo $builds | tr ',' '\n' | while read build; do
-  alpine_version=$(echo "${build}" | cut -d '_' -f 3)
+  ALPINE_VERSION=$(echo "${build}" | cut -d '_' -f 3)
   pg_restore_from_s3_tag=$(echo "${build}" | cut -d '_' -f 1 )
-  pg_package_version=$(echo "${build}" | cut -d '_' -f 2)
+  PG_FULL_VERSION=$(echo "${build}" | cut -d '_' -f 2)
 
   echo ""
   echo "--------------------------------"
   echo "POSTGRES-RESTORE-FROM-S3 TAG: ${pg_restore_from_s3_tag}"
-  echo "POSTGRES PACKAGE VERSION: ${pg_package_version}"
+  echo "POSTGRES PACKAGE VERSION: ${PG_FULL_VERSION}"
   echo "--------------------------------"
 
-  echo docker build --tag bluedrop360/postgres-restore-from-s3:$pg_restore_from_s3_tag --build-arg pg_package_version=$pg_package_version --build-arg alpine_version="${alpine_version}" .
-  eval docker build --tag bluedrop360/postgres-restore-from-s3:$pg_restore_from_s3_tag --build-arg pg_package_version=$pg_package_version --build-arg alpine_version="${alpine_version}" . || exit 1
+  echo docker build --tag bluedrop360/postgres-restore-from-s3:$pg_restore_from_s3_tag --build-arg pg_full_version=$PG_FULL_VERSION --build-arg alpine_version="${ALPINE_VERSION}" .
+  eval docker build --tag bluedrop360/postgres-restore-from-s3:$pg_restore_from_s3_tag --build-arg pg_full_version=$PG_FULL_VERSION --build-arg alpine_version="${ALPINE_VERSION}" . || exit 1
   echo docker push bluedrop360/postgres-restore-from-s3:$pg_restore_from_s3_tag
   eval docker push bluedrop360/postgres-restore-from-s3:$pg_restore_from_s3_tag || exit 1
 done

dev/util/shellcheck.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+printf '\n%s\n' "Checking shell scripts..."
+
+SHELLCHECK_OPTS=""
+
+RUN_SHELLCHECK="shellcheck ${ALLOW_EXTERNAL_SOURCE:-} ${SHELLCHECK_OPTS} {} +"
+eval "find ./*.sh -type f -exec ${RUN_SHELLCHECK}"

docker-compose.yml

@@ -11,14 +11,14 @@ version: '3'
 
 services:
   postgres-restore-from-s3:
-    image: postgres-restore-from-s3:10.10
+    image: postgres-restore-from-s3:11.7
     network_mode: 'host'
     build:
       context: ./
       dockerfile: ./Dockerfile
       args:
-        pg_alpine_branch: '3.8'
-        pg_version: '10.10-r0'
+        alpine_version: '3.9'
+        pg_full_version: '11.7-r0'
     environment:
       AWS_BUCKET: <AWS_BUCKET_NAME>
       AWS_REGION: <AWS_REGION_NAME>

lint.sh

@@ -0,0 +1,3 @@
+ALPINE_VERSION='3.8'
+PG_BASE_VERSION='10'
+PG_FULL_VERSION='10.12'

package/10.12-3.8.env

@@ -0,0 +1,4 @@
+ALPINE_VERSION='3.9'
+PG_LATEST=false
+PG_BASE_VERSION='11'
+PG_FULL_VERSION='11.7'

package/11.7-3.9.env

@@ -0,0 +1,3 @@
+ALPINE_VERSION='3.6'
+PG_BASE_VERSION='9'
+PG_FULL_VERSION='9.6.13'