From 888b3d9d257ca38122b488e1e7bd2c96944d6eb6 Mon Sep 17 00:00:00 2001 From: Matias Melograno Date: Fri, 20 Dec 2024 14:36:27 -0300 Subject: [PATCH] updated deps --- CHANGES.txt | 3 ++- Makefile | 43 ++++++++++++++++++++++++++++++++++++++-- go.mod | 2 +- go.sum | 4 ++-- splitio/commitversion.go | 2 +- splitio/version.go | 2 +- 6 files changed, 48 insertions(+), 8 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2e6a8348..5dd17549 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,9 @@ -5.9.1 (Dec 17, 2024) +5.10.0 (Dec 20, 2024) - Added support for arm64. - Fixed vulnerabilities: - Updated golang image to 1.23.4. - Updated x/crypto dependency. + - Updated x/net dependency. 5.9.0 (Dec 2, 2024) - Split Proxy: diff --git a/Makefile b/Makefile index 85a92525..3174f39b 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,8 @@ BUILD_FIPS_WIN_TMP ?= windows/build SHELL = /usr/bin/env bash -o pipefail ENFORCE_FIPS := -tags enforce_fips CURRENT_OS = $(shell uname -a | awk '{print $$1}') -PLATFORM ?= +PLATFORM ?= linux/arm64/v8,linux/amd64 +BUILDER ?= container # Extra arguments EXTRA_BUILD_ARGS ?= @@ -129,6 +130,44 @@ images_release: # entrypoints @echo "$(DOCKER) push splitsoftware/split-proxy-fips:$(version)" @echo "$(DOCKER) push splitsoftware/split-proxy-fips:latest" +## Build release-ready docker images with proper tags and output push commands in stdout +images_release_multi: # entrypoints + @echo "make sure you have buildx configured 'docker buildx ls', if not 'docker buildx create --name container --driver=docker-container'" + $(DOCKER) buildx build \ + -t splitsoftware/split-synchronizer:latest -t splitsoftware/split-synchronizer:$(version) \ + -f docker/Dockerfile.synchronizer \ + --platform $(PLATFORM) \ + --builder $(BUILDER) \ + --load . + $(DOCKER) buildx build \ + -t splitsoftware/split-proxy:latest -t splitsoftware/split-proxy:$(version) \ + -f docker/Dockerfile.proxy \ + --platform $(PLATFORM) \ + --builder $(BUILDER) \ + --load . + $(DOCKER) buildx build \ + -t splitsoftware/split-synchronizer-fips:latest -t splitsoftware/split-synchronizer-fips:$(version) \ + --build-arg FIPS_MODE=enabled \ + -f docker/Dockerfile.synchronizer \ + --platform $(PLATFORM) \ + --builder $(BUILDER) \ + --load . + $(DOCKER) buildx build \ + -t splitsoftware/split-proxy-fips:latest -t splitsoftware/split-proxy-fips:$(version) \ + --build-arg FIPS_MODE=enabled \ + -f docker/Dockerfile.proxy \ + --platform $(PLATFORM) \ + --builder $(BUILDER) \ + --load . + @echo "Images created. Make sure everything works ok, and then run the following commands to push them." + @echo "$(DOCKER) push splitsoftware/split-synchronizer:$(version)" + @echo "$(DOCKER) push splitsoftware/split-synchronizer:latest" + @echo "$(DOCKER) push splitsoftware/split-proxy:$(version)" + @echo "$(DOCKER) push splitsoftware/split-proxy:latest" + @echo "$(DOCKER) push splitsoftware/split-synchronizer-fips:$(version)" + @echo "$(DOCKER) push splitsoftware/split-synchronizer-fips:latest" + @echo "$(DOCKER) push splitsoftware/split-proxy-fips:$(version)" + @echo "$(DOCKER) push splitsoftware/split-proxy-fips:latest" # -------------------------------------------------------------------------- # # Internal targets: @@ -291,7 +330,7 @@ mkexec = $(if $(findstring windows,$1),$1.exe,$1) installed_from_zip = $(if $(findstring split_sync,$1),split-sync,split-proxy) apptitle_from_zip = $(if $(findstring split_sync,$1),Synchronizer,Proxy) cmdfolder_from_bin = $(if $(findstring split_sync,$1),synchronizer,proxy) -platform_str = $(if $(PLATFORM),--platform=$(PLATFORM),) +platform_str = $(if $(PLATFORM),--platform $(PLATFORM),) # "constants" null := diff --git a/go.mod b/go.mod index 165de4b5..1e29e629 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.8.0 // indirect golang.org/x/crypto v0.31.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect diff --git a/go.sum b/go.sum index 42e905c6..b33e231f 100644 --- a/go.sum +++ b/go.sum @@ -130,8 +130,8 @@ golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ss golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/splitio/commitversion.go b/splitio/commitversion.go index a590ad79..9664660f 100644 --- a/splitio/commitversion.go +++ b/splitio/commitversion.go @@ -5,4 +5,4 @@ This file is created automatically, please do not edit */ // CommitVersion is the version of the last commit previous to release -const CommitVersion = "599fa3f" +const CommitVersion = "5792ac7" diff --git a/splitio/version.go b/splitio/version.go index 7f9767a8..957b3d30 100644 --- a/splitio/version.go +++ b/splitio/version.go @@ -2,4 +2,4 @@ package splitio // Version is the version of this Agent -const Version = "5.9.1" +const Version = "5.10.0"