Skip to content

Commit 0a6f08d

Browse files
committed
Release 18-3.3.2 - See CHANGELOG.md
1 parent 7613635 commit 0a6f08d

4 files changed

Lines changed: 29 additions & 4 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
include:
19-
- { distro: "alpine", distro_variant: "3.22", latest: "false", arch: "linux/amd64,linux/arm64" }
19+
- { distro: "alpine", distro_variant: "3.23", latest: "false", arch: "linux/amd64,linux/arm64" }
2020
uses: nfrastack/gha/.github/workflows/container-build_generic.yml@main
2121
with:
2222
base_image: "ghcr.io/nfrastack/container-base"

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 18-3.3.2 2026-05-06 <code at nfrastack dot com>
2+
3+
### Added
4+
- Bump to Alpine 3.23
5+
6+
### Changed
7+
- Remove dependency on gnu.org when building
8+
9+
110
## 18-3.3.1 2026-03-16 <code at nfastack dot com>
211

312
### Added

Containerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ RUN echo "" && \
9595
&& \
9696
package build go && \
9797
POSTGRES_ZABBIX_PLUGIN_VERSION=${POSTGRES_ZABBIX_PLUGIN_VERSION:-"$(zabbix_agent2 --version | head -n1 | awk {'print $3'})"} ; \
98+
echo "Downloading and Building Postgres Zabbix Plugin version ${POSTGRES_ZABBIX_PLUGIN_VERSION}" && \
9899
mkdir -p /usr/src/postgres-zabbix-plugin ; \
99-
curl -sSL https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${POSTGRES_ZABBIX_PLUGIN_VERSION}.tar.gz | tar xvfz - --strip 2 -C /usr/src/postgres-zabbix-plugin ; \
100+
curl -sSL https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${POSTGRES_ZABBIX_PLUGIN_VERSION}.tar.gz | tar xfz - --strip 2 -C /usr/src/postgres-zabbix-plugin ; \
100101
cd /usr/src/postgres-zabbix-plugin ; \
101102
make ; \
102103
strip zabbix-agent2-plugin-postgresql ; \
@@ -108,8 +109,6 @@ RUN echo "" && \
108109
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 && \
109110
grep '/var/run/postgresql' src/include/pg_config_manual.h.new && \
110111
mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h && \
111-
wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb' && \
112-
wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' && \
113112
export LLVM_CONFIG="/usr/lib/llvm20/bin/llvm-config" && \
114113
export CLANG=clang-20 && \
115114
./configure \

container-postgres.code-workspace

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"folders": [
3+
{
4+
"name": "container-postgres",
5+
"path": "."
6+
},
7+
{
8+
"name": "container-base",
9+
"path": "../container-base"
10+
},
11+
{
12+
"name": "gha",
13+
"path": "../gha"
14+
}
15+
],
16+
"settings": {}
17+
}

0 commit comments

Comments
 (0)