v2.0.9 (#28)

bfren · web-flow · commit 255f4f40a4bc · 2022-03-07T12:05:09.000Z
Minor updates
* Using latest base images
* Moving PostgreSQL build to individual overlay/tmp

Development updates
* Adding pull.sh and run.sh

Documentation updates
* Updating port in README.md
diff --git a/12/Dockerfile b/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.15-4.1.0
+FROM bfren/alpine-s6:alpine3.15-4.1.1
 
 ARG BF_IMAGE
 ARG BF_VERSION
@@ -12,7 +12,7 @@ ENV \
 EXPOSE 5432
 
 COPY ./overlay /
-COPY ./12/POSTGRESQL_BUILD /tmp/
+COPY ./12/overlay /
 
 RUN bf-install
 
diff --git a/12/overlay/tmp/POSTGRESQL_BUILD b/12/overlay/tmp/POSTGRESQL_BUILD
diff --git a/13/Dockerfile b/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.15-4.1.0
+FROM bfren/alpine-s6:alpine3.15-4.1.1
 
 ARG BF_IMAGE
 ARG BF_VERSION
@@ -12,7 +12,7 @@ ENV \
 EXPOSE 5432
 
 COPY ./overlay /
-COPY ./13/POSTGRESQL_BUILD /tmp/
+COPY ./13/overlay /
 
 RUN bf-install
 
diff --git a/13/overlay/tmp/POSTGRESQL_BUILD b/13/overlay/tmp/POSTGRESQL_BUILD
diff --git a/14/Dockerfile b/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.15-4.1.0
+FROM bfren/alpine-s6:alpine3.15-4.1.1
 
 ARG BF_IMAGE
 ARG BF_VERSION
@@ -12,7 +12,7 @@ ENV \
 EXPOSE 5432
 
 COPY ./overlay /
-COPY ./14/POSTGRESQL_BUILD /tmp/
+COPY ./14/overlay /
 
 RUN bf-install
 
diff --git a/14/overlay/tmp/POSTGRESQL_BUILD b/14/overlay/tmp/POSTGRESQL_BUILD
diff --git a/Dockerfile.esh b/Dockerfile.esh
@@ -12,7 +12,7 @@ ENV \
 EXPOSE 5432
 
 COPY ./overlay /
-COPY ./<%= ${POSTGRESQL_MINOR} %>/POSTGRESQL_BUILD /tmp/
+COPY ./<%= ${POSTGRESQL_MINOR} %>/overlay /
 
 RUN bf-install
 
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ See [For Backups](#for-backups) for configuration variables.
 
 ## Ports
 
-* 3306
+* 5432
 
 ## Volumes
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.8
+2.0.9
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="4.1.0"
+BASE_REVISION="4.1.1"
 echo "Base: ${BASE_REVISION}"
 
 POSTGRESQL_VERSIONS="12 13 14"
diff --git a/pull.sh b/pull.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+git reset --hard && git pull
+
+if [ -n "${1-}" ] ; then
+    git checkout ${1} && git pull
+fi
+
+chmod +x pull.sh run.sh
diff --git a/run.sh b/run.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+IMAGE=`cat VERSION`
+POSTGRESQL=${1:-14}
+
+docker buildx build \
+    --build-arg BF_IMAGE=postgresql \
+    --build-arg BF_VERSION=${IMAGE} \
+    -f ${POSTGRESQL}/Dockerfile \
+    -t postgresql${POSTGRESQL}-dev \
+    . \
+    && \
+    docker run -it postgresql${POSTGRESQL}-dev sh
