Add Postgres 12

- New default tag.
- Update upstream entrypoint location, changed in docker-library/postgres#260.
- Build only once in tests.

Author: yajo

.travis.yml

@@ -32,12 +32,13 @@ stages:
 
 env:
   global:
-    - LATEST_RELEASE=11-alpine
+    - LATEST_RELEASE=12-alpine
     - DOCKER_REPO=tecnativa/postgres-autoconf
   jobs:
     - DOCKER_TAG=9.6-alpine
     - DOCKER_TAG=10-alpine
     - DOCKER_TAG=11-alpine
+    - DOCKER_TAG=12-alpine
 
 jobs:
   include:

Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_TAG
 FROM docker.io/postgres:${BASE_TAG}
-ENTRYPOINT [ "/autoconf-entrypoint" ]
+ENTRYPOINT ["/autoconf-entrypoint", "/usr/local/bin/docker-entrypoint.sh"]
 ENV CERTS="{}" \
     CONF_EXTRA="" \
     LAN_AUTH_METHOD=md5 \

autoconf-entrypoint

@@ -128,7 +128,4 @@ permissions_fix(HBA_FILE)
 
 # Continue normal execution
 args = sys.argv[1:]
-if not args or args[0] == "postgres" or args[0].startswith("-"):
-    # Need to go through parent image entrypoint, and hardcode conf file
-    args = ["/docker-entrypoint.sh", *args, "-cconfig_file={}".format(CONF_FILE)]
 os.execvp(args[0], args)

tests/test.py

@@ -16,15 +16,18 @@
 class PostgresAutoconfCase(unittest.TestCase):
     """Test behavior for this docker image"""
 
-    def setUp(self):
+    @classmethod
+    def setUpClass(cls):
         with local.cwd(local.cwd / ".."):
             print("Building image")
             local["./hooks/build"] & FG
+        cls.image = "tecnativa/postgres-autoconf:{}".format(local.env["DOCKER_TAG"])
+        cls.cert_files = {"client.ca.cert.pem", "server.cert.pem", "server.key.pem"}
+        return super().setUpClass()
+
+    def setUp(self):
         docker("network", "create", "lan")
         docker("network", "create", "wan")
-        self.version = os.environ["DOCKER_TAG"]
-        self.image = ("tecnativa/postgres-autoconf:{}".format(self.version),)
-        self.cert_files = {"client.ca.cert.pem", "server.cert.pem", "server.key.pem"}
         return super().setUp()
 
     def tearDown(self):