Merge pull request #655 from jmpsec/go-release-1-24-3

javuto · web-flow · commit b62b250fd8b3 · 2025-05-29T13:00:24.000+02:00
Using golang `1.24.3`
diff --git a/.env.example b/.env.example
@@ -10,5 +10,5 @@ JWT_SECRET=0000000000000000000000000000000000000000000000000000000000000000
 SESSION_KEY=sessionkey
 OSCTRL_USER=admin
 OSCTRL_PASS=Changeme123!
-GOLANG_VERSION=1.24.2
+GOLANG_VERSION=1.24.3
 OSCTRL_TLS_LOGGER=db
diff --git a/.github/actions/build/binaries/action.yml b/.github/actions/build/binaries/action.yml
@@ -19,7 +19,7 @@ inputs:
   golang_version:
     required: false
     description: Define the version of golang to compile with
-    default: 1.24.2
+    default: 1.24.3
 
 runs:
   using: "composite"
diff --git a/.github/actions/test/binaries/action.yml b/.github/actions/test/binaries/action.yml
@@ -19,7 +19,7 @@ inputs:
   golang_version:
     required: false
     description: Define the version of golang to compile with
-    default: 1.24.2
+    default: 1.24.3
 
 runs:
   using: "composite"
diff --git a/.github/workflows/build_and_test_main_merge.yml b/.github/workflows/build_and_test_main_merge.yml
@@ -9,7 +9,7 @@ permissions:
   contents: read
 
 env:
-  GOLANG_VERSION: 1.24.2
+  GOLANG_VERSION: 1.24.3
   OSQUERY_VERSION: 5.16.0
 
 jobs:
diff --git a/.github/workflows/build_and_test_pr.yml b/.github/workflows/build_and_test_pr.yml
@@ -5,7 +5,7 @@ permissions:
 on: [push, pull_request]
 
 env:
-  GOLANG_VERSION: 1.24.2
+  GOLANG_VERSION: 1.24.3
   OSQUERY_VERSION: 5.16.0
 
 jobs:
diff --git a/.github/workflows/create_tagged_releases.yml b/.github/workflows/create_tagged_releases.yml
@@ -10,7 +10,7 @@ permissions:
   contents: read
 
 env:
-  GOLANG_VERSION: 1.24.2
+  GOLANG_VERSION: 1.24.3
   OSQUERY_VERSION: 5.16.0
 
 jobs:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -14,7 +14,7 @@ permissions:
   contents: read
 
 env:
-  GOLANG_VERSION: 1.24.2
+  GOLANG_VERSION: 1.24.3
 
 jobs:
   golangci:
diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-admin b/deploy/docker/dockerfiles/Dockerfile-dev-admin
@@ -1,5 +1,5 @@
 ######################################## osctrl-dev-base ########################################
-ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.2}
+ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.3}
 FROM golang:${GOLANG_VERSION} AS osctrl-admin-dev
 
 WORKDIR /usr/src/app
diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-api b/deploy/docker/dockerfiles/Dockerfile-dev-api
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.2}
+ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.3}
 FROM golang:${GOLANG_VERSION} AS osctrl-api-dev
 
 WORKDIR /usr/src/app
diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-cli b/deploy/docker/dockerfiles/Dockerfile-dev-cli
@@ -1,5 +1,5 @@
 #################################################### osctrl-cli-dev ####################################################
-ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.2}
+ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.3}
 FROM golang:${GOLANG_VERSION} AS osctrl-cli-dev
 
 WORKDIR /usr/src/app
diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-tls b/deploy/docker/dockerfiles/Dockerfile-dev-tls
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.2}
+ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.3}
 FROM golang:${GOLANG_VERSION} AS osctrl-tls-dev
 
 WORKDIR /usr/src/app
diff --git a/deploy/lib.sh b/deploy/lib.sh
@@ -405,9 +405,9 @@ function set_motd_centos() {
   echo "$__centosmotd" | sudo tee -a /etc/profile
 }
 
-# Install go 1.24.2 from tgz
+# Install go 1.24.3 from tgz
 function install_go_24() {
-  local __version="1.24.2"
+  local __version="1.24.3"
   local __arch="$(uname -i)"
   if [[ "$__arch" == "aarch64" ]]; then
     __arch="arm64"
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/jmpsec/osctrl
 
-go 1.24.2
+go 1.24.3
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.2

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.2}`
	`1`	`+ARG GOLANG_VERSION=${GOLANG_VERSION:-1.24.3}`
`2`	`2`	`FROM golang:${GOLANG_VERSION} AS osctrl-api-dev`
`3`	`3`
`4`	`4`	`WORKDIR /usr/src/app`