feat: postgres

Author: hongaar

.github/workflows/postgres.yml

@@ -6,28 +6,30 @@ on:
       - "postgres/**"
 
 env:
-  POSTGRES_VERSION: 12.3-2
-  DOCKER_TAG: 12.3
+  IMAGE: postgres
+  VERSION: 12.3
+  DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+  DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
 
 jobs:
   build:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: bash
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+
     steps:
       - uses: actions/checkout@v1
-      - name: build
-        run: |
-          cd postgres
-          docker build --build-arg VERSION=$POSTGRES_VERSION --file Dockerfile.windows --tag exivity/postgres:$DOCKER_TAG .
-          docker tag exivity/postgres:$DOCKER_TAG exivity/postgres:latest
-      - name: login
-        run: echo $DOCKER_HUB_TOKEN | docker login -u $DOCKER_HUB_USER --password-stdin
+      - run: bash build.sh
         env:
-          DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
-          DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
-      - name: push
-        run: |
-          docker push exivity/postgres:$DOCKER_TAG
-          docker push exivity/postgres:latest
+          CI_PLATFORM: ${{ matrix.os }}
+          EXTRA_BUILD_ARG: 12.3-2
+
+  manifest:
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - run: bash manifest.sh

base/Dockerfile.windows

@@ -1,17 +1,17 @@
 # escape=`
+
+ARG PS_VERSION=7.0.3
+ARG NODE_VERSION=12.18.3
+ARG YARN_VERSION=1.22.4
+ARG GIT_VERSION=2.28.0
+
 ARG SOURCE=mcr.microsoft.com/windows/servercore:ltsc2019
 ARG TARGET=$SOURCE
 
 # Use server core as an installer container
 # As this is a multi-stage build, this stage will eventually be thrown away
 FROM $SOURCE AS installer-env
 
-# Set versions
-ARG PS_VERSION=7.0.3
-ARG NODE_VERSION=12.18.3
-ARG YARN_VERSION=1.22.4
-ARG GIT_VERSION=2.28.0
-
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 # Install PowerShell

base/README.md

@@ -1,6 +1,6 @@
 # exivity/base
 
-Multiarch Docker base image (Windows and Linux).
+Docker base image
 
 ## Usage
 
@@ -30,3 +30,6 @@ Base image: _ubuntu:latest_
 
 - zip
 - unzip
+- git
+- nodejs 12
+- yarn 1

build.sh

@@ -14,6 +14,7 @@ LATEST_TAG=latest-$PLATFORM
 
 docker build \
     --build-arg VERSION=$VERSION \
+    --build-arg EXTRA_BUILD_ARG=$EXTRA_BUILD_ARG \
     --file $DOCKERFILE \
     --tag exivity/$IMAGE:$VERSION_TAG \
     .

postgres/Dockerfile.linux

@@ -0,0 +1,7 @@
+ARG VERSION
+
+FROM postgres:$VERSION
+
+COPY healthcheck.sh /usr/local/bin/
+
+HEALTHCHECK CMD ["healthcheck.sh"]

postgres/Dockerfile.windows

@@ -3,9 +3,9 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2019 AS download
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG VERSION
+ARG EXTRA_BUILD_ARG
 
-RUN Invoke-WebRequest $('https://get.enterprisedb.com/postgresql/postgresql-{0}-windows-x64-binaries.zip' -f $env:VERSION) -OutFile 'postgres.zip' -UseBasicParsing ; \
+RUN Invoke-WebRequest $('https://get.enterprisedb.com/postgresql/postgresql-{0}-windows-x64-binaries.zip' -f $env:EXTRA_BUILD_ARG) -OutFile 'postgres.zip' -UseBasicParsing ; \
     Expand-Archive postgres.zip -DestinationPath C:\ ; \
     Remove-Item postgres.zip
 

postgres/README.md

@@ -1,6 +1,6 @@
 # exivity/postgres
 
-Docker image of PostgreSQL server (Windows only).
+Docker image of PostgreSQL server
 
 ## Usage
 

postgres/healthcheck.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# https://github.com/docker-library/healthcheck/blob/master/postgres/docker-healthcheck
+
+set -eo pipefail
+
+host="$(hostname -i || echo '127.0.0.1')"
+user="${POSTGRES_USER:-postgres}"
+db="${POSTGRES_DB:-$POSTGRES_USER}"
+export PGPASSWORD="${POSTGRES_PASSWORD:-}"
+
+args=(
+	# force postgres to not use the local unix socket (test "external" connectibility)
+	--host "$host"
+	--username "$user"
+	--dbname "$db"
+	--quiet --no-align --tuples-only
+)
+
+if select="$(echo 'SELECT 1' | psql "${args[@]}")" && [ "$select" = '1' ]; then
+	exit 0
+fi
+
+exit 1

rabbitmq/Dockerfile.linux

@@ -1,4 +1,6 @@
-FROM rabbitmq
+ARG VERSION
+
+FROM rabbitmq:$VERSION-management
 
 COPY healthcheck.sh /usr/local/bin/
 

rabbitmq/Dockerfile.windows

@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
-
 ARG VERSION
 
+FROM mcr.microsoft.com/windows/servercore:ltsc2019
+
 USER ContainerAdministrator
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

rabbitmq/README.md

@@ -1,6 +1,6 @@
 # exivity/rabbitmq
 
-Docker image of Rabbit MQ server.
+Docker image of Rabbit MQ server
 
 ## Usage