v2.0.0 (#19)

bfren · web-flow · commit cd5412cd5cc4 · 2022-02-11T12:57:57.000Z
Major updates
* **Breaking changes** major rewrite of S6 Overlay for v3.0.0.0 - see base image and documentation for more information

Documentation updates
* Updating copyright year to 2022

Build updates
* Removing dev edge build
diff --git a/.github/workflows/dev-edge.yml b/.github/workflows/dev-edge.yml
diff --git a/12/Dockerfile b/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.15-3.2.3
+FROM bfren/alpine-s6:alpine3.15-4.0.1
 
 ARG BF_IMAGE
 ARG BF_VERSION
@@ -12,7 +12,7 @@ ENV \
 EXPOSE 5432
 
 COPY ./overlay /
-COPY ./12/POSTGRESQL_BUILD /tmp/VERSION
+COPY ./12/POSTGRESQL_BUILD /tmp/
 
 RUN bf-install
 
diff --git a/13/Dockerfile b/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.15-3.2.3
+FROM bfren/alpine-s6:alpine3.15-4.0.1
 
 ARG BF_IMAGE
 ARG BF_VERSION
@@ -12,7 +12,7 @@ ENV \
 EXPOSE 5432
 
 COPY ./overlay /
-COPY ./13/POSTGRESQL_BUILD /tmp/VERSION
+COPY ./13/POSTGRESQL_BUILD /tmp/
 
 RUN bf-install
 
diff --git a/14/Dockerfile b/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.15-3.2.3
+FROM bfren/alpine-s6:alpine3.15-4.0.1
 
 ARG BF_IMAGE
 ARG BF_VERSION
@@ -12,7 +12,7 @@ ENV \
 EXPOSE 5432
 
 COPY ./overlay /
-COPY ./14/POSTGRESQL_BUILD /tmp/VERSION
+COPY ./14/POSTGRESQL_BUILD /tmp/
 
 RUN bf-install
 
diff --git a/Dockerfile.esh b/Dockerfile.esh
@@ -12,7 +12,7 @@ ENV \
 EXPOSE 5432
 
 COPY ./overlay /
-COPY ./<%= ${POSTGRESQL_MINOR} %>/POSTGRESQL_BUILD /tmp/VERSION
+COPY ./<%= ${POSTGRESQL_MINOR} %>/POSTGRESQL_BUILD /tmp/
 
 RUN bf-install
 
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 bfren
+Copyright (c) 2021-2022 bfren
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -71,4 +71,4 @@ See [For Backups](#for-backups) for configuration variables.
 
 ## Copyright
 
-> Copyright (c) 2021 [bfren](https://bfren.dev) (unless otherwise stated)
+> Copyright (c) 2021-2022 [bfren](https://bfren.dev) (unless otherwise stated)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.3
+2.0.0
diff --git a/VERSION_MAJOR b/VERSION_MAJOR
@@ -1 +1 @@
-1
+2
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-1.4
+2.0
diff --git a/edge/Dockerfile b/edge/Dockerfile
diff --git a/edge/POSTGRESQL_BUILD b/edge/POSTGRESQL_BUILD
diff --git a/edge/POSTGRESQL_MINOR b/edge/POSTGRESQL_MINOR
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="3.2.3"
+BASE_REVISION="4.0.1"
 echo "Base: ${BASE_REVISION}"
 
 POSTGRESQL_VERSIONS="12 13 14"
@@ -14,6 +14,7 @@ for V in ${POSTGRESQL_VERSIONS} ; do
 
     DOCKERFILE=$(docker run \
         -v ${PWD}:/ws \
+        -e BF_DEBUG=0 \
         bfren/alpine esh \
         "/ws/Dockerfile.esh" \
         BASE_REVISION=${BASE_REVISION} \
diff --git a/overlay/etc/bf/ch.d/10-postgresql b/overlay/etc/bf/ch.d/10-postgresql
@@ -0,0 +1,4 @@
+/backup postgres:postgres 0770 0750
+/data postgres:postgres 0770 0750
+/run/postgresql postgres:postgres 0770 0750
+/usr/bin/bf/db-exists root:root 0555
diff --git a/overlay/etc/bf/init.d/10-env b/overlay/etc/bf/init.d/10-env
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/etc/bf/init.d/11-user b/overlay/etc/bf/init.d/11-user
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/etc/bf/init.d/12-postgresql-init b/overlay/etc/bf/init.d/12-postgresql-init
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/etc/fix-attrs.d/10-postgresql b/overlay/etc/fix-attrs.d/10-postgresql
diff --git a/overlay/etc/s6-overlay/s6-rc.d/postgres/dependencies b/overlay/etc/s6-overlay/s6-rc.d/postgres/dependencies
@@ -0,0 +1 @@
+init
diff --git a/overlay/etc/s6-overlay/s6-rc.d/postgres/finish b/overlay/etc/s6-overlay/s6-rc.d/postgres/finish
@@ -1,11 +1,12 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
+export BF_E="${PWD##*/}/$(basename ${0})"
 
 
 #======================================================================================================================
 # Show helpful log message.
 #======================================================================================================================
 
 s6-setuidgid postgres ${POSTGRESQL_LIB}/finish
-bf-svc-finish -s ${PWD##*/} -t
+bf-svc-finish -t
diff --git a/overlay/etc/s6-overlay/s6-rc.d/postgres/run b/overlay/etc/s6-overlay/s6-rc.d/postgres/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E="${PWD##*/}/$(basename ${0})"
diff --git a/overlay/etc/s6-overlay/s6-rc.d/postgres/type b/overlay/etc/s6-overlay/s6-rc.d/postgres/type
@@ -0,0 +1 @@
+longrun
diff --git a/overlay/etc/s6-overlay/s6-rc.d/user/contents.d/postgres b/overlay/etc/s6-overlay/s6-rc.d/user/contents.d/postgres
diff --git a/overlay/tmp/install b/overlay/tmp/install
@@ -17,8 +17,8 @@ bf-adduser postgres
 
 cd /tmp
 
-VERSION=$(cat VERSION)
-bf-debug "PostgreSQL version ${VERSION}."
+VERSION=$(cat POSTGRESQL_BUILD)
+bf-echo "PostgreSQL version ${VERSION}."
 
 
 #======================================================================================================================
@@ -38,7 +38,7 @@ bf-done
 # Create PostgreSQL directories.
 #======================================================================================================================
 
-bf-debug "Creating PostgreSQL directories."
+bf-echo "Creating PostgreSQL directories."
 
 mkdir /data
 mkdir /backup
@@ -49,5 +49,5 @@ mkdir /run/postgresql
 # Add backup executable to main cron.
 #======================================================================================================================
 
-bf-debug "Adding db-backup to cron."
-echo "0 */8 * * * /usr/local/bin/db-backup" >> /etc/crontabs/root
+bf-echo "Adding db-backup to cron."
+echo "0 */8 * * * /usr/bin/bf/db-backup" >> /etc/crontabs/root
diff --git a/overlay/usr/bin/bf/db-backup b/overlay/usr/bin/bf/db-backup
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/db-exists b/overlay/usr/bin/bf/db-exists
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/db-export b/overlay/usr/bin/bf/db-export
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/db-import b/overlay/usr/bin/bf/db-import
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/db-regenerate-config b/overlay/usr/bin/bf/db-regenerate-config
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 
diff --git a/overlay/usr/bin/bf/db-restore b/overlay/usr/bin/bf/db-restore
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/db-stop b/overlay/usr/bin/bf/db-stop
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/healthcheck b/overlay/usr/bin/bf/healthcheck
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/lib/bf/postgresql/backup b/overlay/usr/lib/bf/postgresql/backup
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/lib/bf/postgresql/config b/overlay/usr/lib/bf/postgresql/config
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/lib/bf/postgresql/export b/overlay/usr/lib/bf/postgresql/export
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/lib/bf/postgresql/finish b/overlay/usr/lib/bf/postgresql/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/lib/bf/postgresql/import b/overlay/usr/lib/bf/postgresql/import
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/lib/bf/postgresql/init b/overlay/usr/lib/bf/postgresql/init
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/lib/bf/postgresql/restore b/overlay/usr/lib/bf/postgresql/restore
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 set -euo pipefail
 export BF_E=`basename ${0}`

Original file line number	Diff line number	Diff line change
`@@ -71,4 +71,4 @@ See [For Backups](#for-backups) for configuration variables.`
`71`	`71`
`72`	`72`	`## Copyright`
`73`	`73`
`74`		`-> Copyright (c) 2021 [bfren](https://bfren.dev) (unless otherwise stated)`
	`74`	`+> Copyright (c) 2021-2022 [bfren](https://bfren.dev) (unless otherwise stated)`