Skip to content

Commit d30a8d7

Browse files
bhavyahemGitHub Enterprise
authored andcommitted
Update go, UBI and fix compile issues (#975)
* Update go, UBI and fix compile issues * Updated gosec version * Changed the format specifier
1 parent 49c8d22 commit d30a8d7

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

Dockerfile-server

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# limitations under the License.
1414

1515
ARG BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal
16-
ARG BASE_TAG=9.6-1751286687
16+
ARG BASE_TAG=9.6-1752069876
1717
ARG BUILDER_IMAGE=registry.access.redhat.com/ubi9/go-toolset
18-
ARG BUILDER_TAG=1.23.9-1751538372
18+
ARG BUILDER_TAG=1.24.4-1752083840
1919
ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
2020
ARG MQ_ARCHIVE="downloads/9.4.0.12-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
2121

cmd/runmqserver/logging.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ func configureLogger(name string) (mirrorFunc, error) {
299299
} else {
300300
// The log being mirrored isn't JSON, so just print it. This can happen only in case of mqsc logs
301301
if checkLogSourceForMirroring("mqsc") && canMQSCLogBeMirroredToConsole(msg) {
302-
log.Printf(strings.TrimSpace(msg))
302+
log.Printf("%s", strings.TrimSpace(msg))
303303
}
304304
}
305305
return true

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/ibm-messaging/mq-container
22

3-
go 1.23.9
3+
go 1.24.4
44

55
require (
66
github.com/ibm-messaging/mq-golang v2.0.0+incompatible

install-build-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ sudo apt-get update || :
2525
sudo apt-get install -y jq
2626

2727
go install golang.org/x/lint/golint@latest
28-
curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin v2.14.0 || echo "Gosec not installed. Platform may not be supported."
28+
curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin v2.22.5 || echo "Gosec not installed. Platform may not be supported."

test/container/docker_api_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,9 @@ func TestVolumeUnmount(t *testing.T) {
442442
if rc == 0 {
443443
t.Errorf("Expected chkmqhealthy to fail")
444444
_, df := execContainer(t, cli, ctrID, "", []string{"df"})
445-
t.Logf(df)
445+
t.Logf("%v", df)
446446
_, ps := execContainer(t, cli, ctrID, "", []string{"ps", "-ef"})
447-
t.Logf(ps)
447+
t.Logf("%v", ps)
448448
}
449449
}
450450

test/container/docker_api_test_util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ func startContainerError(t *testing.T, cli ce.ContainerInterface, ID string) err
944944

945945
// testLogFilePages validates that the specified number of logFilePages is present in the qm.ini file.
946946
func testLogFilePages(t *testing.T, cli ce.ContainerInterface, id string, qmName string, expectedLogFilePages string) {
947-
catIniFileCommand := fmt.Sprintf("cat /var/mqm/qmgrs/" + qmName + "/qm.ini")
947+
catIniFileCommand := fmt.Sprintf("%s", "cat /var/mqm/qmgrs/" + qmName + "/qm.ini")
948948
_, iniContent := execContainer(t, cli, id, "", []string{"bash", "-c", catIniFileCommand})
949949

950950
if !strings.Contains(iniContent, "LogFilePages="+expectedLogFilePages) {

travis-build-scripts/go-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
set -ex
2121

22-
GO_VERSION="1.23.9"
22+
GO_VERSION="1.24.4"
2323
sudo rm -rf /usr/local/go
2424
DOWNLOAD_URL="https://go.dev/dl/go${GO_VERSION}.linux-${ARCH}.tar.gz"
2525
curl -fLo go.tar.gz "${DOWNLOAD_URL}"

0 commit comments

Comments
 (0)