3.3.0pre

Author: tiredofit

CHANGELOG.md

@@ -1,12 +1,12 @@
 ## 18-3.3.0pre 2025-10-06 <code at nfrastack dot com>
 
    ### Added
-      - Postgres 18.0
+      - Postgres 18.1
       - Switch base image to nfrastack/base
       - Alpine 3.22
       - Clang 20
       - LLVM 20
-      - Zabbix Postgres plugin 7.4.3
+      - Zabbix Postgres plugin 7.4.5
 
 ## 17-3.2.99 2025-10-06 <dave at tiredofit dot ca>
 

Containerfile

@@ -18,7 +18,8 @@ LABEL \
         org.opencontainers.image.licenses="MIT"
 
 ARG \
-    POSTGRES_VERSION="18.0" \
+    POSTGRES_VERSION="REL_18_1" \
+    POSTGRES_REPO_URL="https://github.com/postgres/postgres" \
     POSTGRES_ZABBIX_PLUGIN_VERSION
 
 COPY CHANGELOG.md /usr/src/container/CHANGELOG.md
@@ -103,9 +104,7 @@ RUN echo "" && \
         cp zabbix-agent2-plugin-postgresql /var/lib/zabbix/plugins ; \
         container_build_log add "Postgres Zabbix Plugin" "${POSTGRES_ZABBIX_PLUGIN_VERSION}" "zabbix.com" ; \
     fi ; \
-    mkdir -p /usr/src/postgres && \
-    curl -sSL https://ftp.postgresql.org/pub/source/v${POSTGRES_VERSION}/postgresql-${POSTGRES_VERSION}.tar.bz2 | tar xvfj - --strip 1 -C /usr/src/postgres && \
-    cd /usr/src/postgres && \
+    clone_git_repo "${POSTGRES_REPO_URL}" "${POSTGRES_VERSION}" && \
     awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new && \
     grep '/var/run/postgresql' src/include/pg_config_manual.h.new && \
     mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h && \
@@ -143,7 +142,7 @@ RUN echo "" && \
     make -j "$(nproc)" -C contrib && \
     make -C contrib/ install && \
     package install SCANNED_RUNTIME_DEPS && \
-    container_build_log add "Postgresql" "${POSTGRES_VERSION}" "postgresql.org" && \
+    container_build_log add "Postgresql" "$(echo ${POSTGRES_VERSION#REL_} | tr '_' '.')" "${POSTGRES_REPO_URL}" && \
     rm -rf \
 	        /usr/local/share/doc \
 	        /usr/local/share/man \

README.md

@@ -176,17 +176,20 @@ Automatically create user databases on startup. This can be done on each contain
 
 Create multiple databases and different usernames and passwords to access. You can share usernames and passwords for multiple databases by using the same user and password in each entry.
 
-| Parameter        | Description                                        | Default | `_FILE` |
-| ---------------- | -------------------------------------------------- | ------- | ------- |
-| `DB01_NAME`      | First Database Name e.g. `database1`               |         | x       |
-| `DB01_USER`      | First Database User e.g. `user1`                   |         | x       |
-| `DB01_PASS`      | First Database Pass e.g. `password1`               |         | x       |
-| `DB01_EXTENSION` | (optional) Database Extension e.g. `unaccent`      |         | x       |
-| `DB02_NAME`      | Second Database Name e.g. `database1`              |         | x       |
-| `DB02_USER`      | Second Database User e.g. `user2`                  |         | x       |
-| `DB02_PASS`      | Second Database Pass e.g. `password2`              |         | x       |
-| `DB02_EXTENSION` | (optional) Database Extension e.g. `unaccent`      |         |         |
-| `DBXX_...`       | As above, should be able to go all the way to `99` |         |         |
+| Parameter        | Description                                        | Default | `_FILE` | Advanced |
+| ---------------- | -------------------------------------------------- | ------- | ------- | -------- |
+| `DB01_NAME`      | First Database Name e.g. `database1`               |         | x       |  |
+| `DB01_USER`      | First Database User e.g. `user1`                   |         | x       | |
+| `DB01_PASS`      | First Database Pass e.g. `password1`               |         | x       | |
+| `DB01_EXTENSION` | (optional) Database Extension e.g. `unaccent`      |         | x       | |
+| `DB02_NAME`      | Second Database Name e.g. `database1`              |         | x       | |
+| `DB02_USER`      | Second Database User e.g. `user2`                  |         | x       | |
+| `DB02_PASS`      | Second Database Pass e.g. `password2`              |         | x       | |
+| `DB02_EXTENSION` | (optional) Database Extension e.g. `unaccent`      |         |         | |
+| `DBXX_...`       | As above, should be able to go all the way to `99` |         |         | x |
+
+Advanced mode allows you to maange more than 3 databases.
+
 
 #### Replication Options