Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Conarx Containers - Zabbix Docker Image
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Docker Containers
Conarx Containers - Zabbix Docker Image
Commits
e882443c
Commit
e882443c
authored
4 months ago
by
Nigel Kukard
Browse files
Options
Downloads
Plain Diff
Merge branch 'nkupdates-edge' into 'edge'
chore: updated to version 7.2.1 See merge request
!62
parents
db027760
23cec8ba
Branches
Branches containing commit
No related tags found
2 merge requests
!66
Updated to Alpine 3.21
,
!62
chore: updated to version 7.2.1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+2
-2
2 additions, 2 deletions
Dockerfile
tests/docker-compose.yml.timescaledb.tmpl
+1
-1
1 addition, 1 deletion
tests/docker-compose.yml.timescaledb.tmpl
with
3 additions
and
3 deletions
Dockerfile
+
2
−
2
View file @
e882443c
...
...
@@ -24,8 +24,8 @@ FROM registry.conarx.tech/containers/nginx-php/edge as builder
# UPDATE timescaledb version in tests/docker-compose.yml.timescaledb.tmpl to the max supported version
# ref https://hub.docker.com/repository/docker/allworldit/postgresql-timescaledb/tags?page=1&ordering=last_updated
# ref https://git
hub.com/zabbix/zabbix/blob/6e6aa6c5a866e56648410275a936959a5100712c
/include/zbx_dbversion_constants.h
#L62
ENV
ZABBIX_VER=7.
0.6
# ref https://git
.zabbix.com/projects/ZBX/repos/zabbix/browse
/include/zbx_dbversion_constants.h
?at=refs%2Ftags%2F7.2.1
ENV
ZABBIX_VER=7.
2.1
COPY
patches /build/patches
...
...
This diff is collapsed.
Click to expand it.
tests/docker-compose.yml.timescaledb.tmpl
+
1
−
1
View file @
e882443c
...
...
@@ -567,7 +567,7 @@ services:
# MAIN ZABBIX DATABASE SERVER
postgresql-server:
image: registry.conarx.tech/containers/postgresql-timescaledb/3.
19
:pg1
6
-2.1
4
.2
image: registry.conarx.tech/containers/postgresql-timescaledb/3.
20
:pg1
7
-2.1
7
.2
environment:
- POSTGRES_USER=zabbix
- POSTGRES_PASSWORD=zabbix
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment