From 55829d3d69252080a7ef021419a5755e8e4dd373 Mon Sep 17 00:00:00 2001
From: Tommi2Day <tommi2day@tommi2day.net>
Date: Fri, 23 Aug 2024 19:34:42 +0200
Subject: [PATCH] update test docker versions

---
 CHANGELOG.md                      | 6 +++---
 dblib/oracle_docker_test.go       | 2 +-
 dblib/tns_dns_docker_test.go      | 2 +-
 dblib/tns_ldap_docker_test.go     | 4 +---
 ldaplib/ldap_docker_test.go       | 2 +-
 maillib/mail_docker_test.go       | 2 +-
 netlib/dns_docker_test.go         | 2 +-
 test/docker/dns/Dockerfile        | 2 +-
 test/docker/oracle-dns/Dockerfile | 2 +-
 9 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd7c7df..59708f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,9 @@
 - common: add StructToMap and StructToString functions
 ### Changed
 - pwlib: refactor gpg gopass test files
-- update linter githib-action
-### Fixed
-- mail: type in setTimeout
+- update linter github-action
+- mail: setTimeout uses int64
+- update test docker image versions
 
 ## [v1.14.7 - 2024-08-18]
 ### Changed
diff --git a/dblib/oracle_docker_test.go b/dblib/oracle_docker_test.go
index 75d1deb..e6bad16 100644
--- a/dblib/oracle_docker_test.go
+++ b/dblib/oracle_docker_test.go
@@ -15,7 +15,7 @@ import (
 // DBPort is the port of the Oracle DB to access
 const DBPort = "21522"
 const repo = "docker.io/gvenzl/oracle-free"
-const repoTag = "23.3-slim"
+const repoTag = "23.5-slim"
 const containerTimeout = 600
 
 // SYSTEMUSER is the name of the default DBA user
diff --git a/dblib/tns_dns_docker_test.go b/dblib/tns_dns_docker_test.go
index e4312d5..618e69b 100644
--- a/dblib/tns_dns_docker_test.go
+++ b/dblib/tns_dns_docker_test.go
@@ -76,7 +76,7 @@ func prepareDNSContainer() (container *dockertest.Resource, err error) {
 		},
 		{
 			Name:  "BIND9_VERSION",
-			Value: "9.18",
+			Value: "9.20",
 		},
 	}
 	container, err = pool.BuildAndRunWithBuildOptions(
diff --git a/dblib/tns_ldap_docker_test.go b/dblib/tns_ldap_docker_test.go
index ca530aa..cce3e9e 100644
--- a/dblib/tns_ldap_docker_test.go
+++ b/dblib/tns_ldap_docker_test.go
@@ -14,10 +14,8 @@ import (
 	"github.com/ory/dockertest/v3/docker"
 )
 
-// const Ldaprepo = "docker.io/osixia/openldap"
-// const LdaprepoTag = "1.5.0"
 const Ldaprepo = "docker.io/bitnami/openldap"
-const LdaprepoTag = "2.6.7"
+const LdaprepoTag = "2.6.8"
 const LdapcontainerTimeout = 120
 
 var TnsLdapcontainerName string
diff --git a/ldaplib/ldap_docker_test.go b/ldaplib/ldap_docker_test.go
index 8f72374..e7cf09c 100644
--- a/ldaplib/ldap_docker_test.go
+++ b/ldaplib/ldap_docker_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 const Ldaprepo = "docker.io/bitnami/openldap"
-const LdaprepoTag = "2.6.7"
+const LdaprepoTag = "2.6.8"
 const LdapcontainerTimeout = 120
 
 var ldapcontainerName string
diff --git a/maillib/mail_docker_test.go b/maillib/mail_docker_test.go
index b7b93eb..2195244 100644
--- a/maillib/mail_docker_test.go
+++ b/maillib/mail_docker_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 const mailRepo = "docker.io/mailserver/docker-mailserver"
-const mailRepoTag = "13.2.0"
+const mailRepoTag = "13.3.1"
 const smtpPort = 31025
 const imapPort = 31143
 const sslPort = 31465
diff --git a/netlib/dns_docker_test.go b/netlib/dns_docker_test.go
index 202d1c4..99a4237 100644
--- a/netlib/dns_docker_test.go
+++ b/netlib/dns_docker_test.go
@@ -76,7 +76,7 @@ func prepareNetlibDNSContainer() (container *dockertest.Resource, err error) {
 		},
 		{
 			Name:  "BIND9_VERSION",
-			Value: "9.18",
+			Value: "9.20",
 		},
 	}
 	dockerContextDir := test.TestDir + "/docker/dns"
diff --git a/test/docker/dns/Dockerfile b/test/docker/dns/Dockerfile
index 5613c43..cf8b486 100644
--- a/test/docker/dns/Dockerfile
+++ b/test/docker/dns/Dockerfile
@@ -1,4 +1,4 @@
-ARG BIND_VERSION=9.18
+ARG BIND_VERSION=9.20
 ARG VENDOR_IMAGE_PREFIX=""
 ARG BIND_IMAGE=${VENDOR_IMAGE_PREFIX}docker.io/internetsystemsconsortium/bind9:${BIND_VERSION}
 FROM ${BIND_IMAGE}
diff --git a/test/docker/oracle-dns/Dockerfile b/test/docker/oracle-dns/Dockerfile
index 24a33eb..9bf0029 100644
--- a/test/docker/oracle-dns/Dockerfile
+++ b/test/docker/oracle-dns/Dockerfile
@@ -1,4 +1,4 @@
-ARG BIND_VERSION=9.18
+ARG BIND_VERSION=9.20
 ARG VENDOR_IMAGE_PREFIX=""
 ARG BIND_IMAGE=${VENDOR_IMAGE_PREFIX}docker.io/internetsystemsconsortium/bind9:${BIND_VERSION}
 FROM ${BIND_IMAGE}