Skip to content

Commit 57defbc

Browse files
mmelogranommelograno
authored
Merge pull request #300 from splitio/task/armBuild
Task/arm build
2 parents e2a4558 + 8f0fac8 commit 57defbc

File tree

7 files changed

+65
-21
lines changed

7 files changed

+65
-21
lines changed

‎CHANGES.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
5.10.0 (Jan 17, 2024)
22
- Added support for the new impressions tracking toggle available on feature flags, both respecting the setting. Read more in our docs.
3+
- Added support for arm64.
4+
- Fixed vulnerabilities:
5+
- Updated golang image to 1.23.4.
6+
- Updated x/crypto dependency.
7+
- Updated x/net dependency.
38

49
5.9.0 (Dec 2, 2024)
510
- Split Proxy:

‎Makefile

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ BUILD_FIPS_WIN_TMP ?= windows/build
1111
SHELL = /usr/bin/env bash -o pipefail
1212
ENFORCE_FIPS := -tags enforce_fips
1313
CURRENT_OS = $(shell uname -a | awk '{print $$1}')
14-
PLATFORM ?=
14+
PLATFORM ?= linux/arm64/v8,linux/amd64
15+
BUILDER ?= container
1516

1617
# Extra arguments
1718
EXTRA_BUILD_ARGS ?=
@@ -129,6 +130,44 @@ images_release: # entrypoints
129130
@echo "$(DOCKER) push splitsoftware/split-proxy-fips:$(version)"
130131
@echo "$(DOCKER) push splitsoftware/split-proxy-fips:latest"
131132

133+
## Build release-ready docker images with proper tags and output push commands in stdout
134+
images_release_multi: # entrypoints
135+
@echo "make sure you have buildx configured 'docker buildx ls', if not 'docker buildx create --name container --driver=docker-container'"
136+
$(DOCKER) buildx build \
137+
-t splitsoftware/split-synchronizer:latest -t splitsoftware/split-synchronizer:$(version) \
138+
-f docker/Dockerfile.synchronizer \
139+
--platform $(PLATFORM) \
140+
--builder $(BUILDER) \
141+
--load .
142+
$(DOCKER) buildx build \
143+
-t splitsoftware/split-proxy:latest -t splitsoftware/split-proxy:$(version) \
144+
-f docker/Dockerfile.proxy \
145+
--platform $(PLATFORM) \
146+
--builder $(BUILDER) \
147+
--load .
148+
$(DOCKER) buildx build \
149+
-t splitsoftware/split-synchronizer-fips:latest -t splitsoftware/split-synchronizer-fips:$(version) \
150+
--build-arg FIPS_MODE=enabled \
151+
-f docker/Dockerfile.synchronizer \
152+
--platform $(PLATFORM) \
153+
--builder $(BUILDER) \
154+
--load .
155+
$(DOCKER) buildx build \
156+
-t splitsoftware/split-proxy-fips:latest -t splitsoftware/split-proxy-fips:$(version) \
157+
--build-arg FIPS_MODE=enabled \
158+
-f docker/Dockerfile.proxy \
159+
--platform $(PLATFORM) \
160+
--builder $(BUILDER) \
161+
--load .
162+
@echo "Images created. Make sure everything works ok, and then run the following commands to push them."
163+
@echo "$(DOCKER) push splitsoftware/split-synchronizer:$(version)"
164+
@echo "$(DOCKER) push splitsoftware/split-synchronizer:latest"
165+
@echo "$(DOCKER) push splitsoftware/split-proxy:$(version)"
166+
@echo "$(DOCKER) push splitsoftware/split-proxy:latest"
167+
@echo "$(DOCKER) push splitsoftware/split-synchronizer-fips:$(version)"
168+
@echo "$(DOCKER) push splitsoftware/split-synchronizer-fips:latest"
169+
@echo "$(DOCKER) push splitsoftware/split-proxy-fips:$(version)"
170+
@echo "$(DOCKER) push splitsoftware/split-proxy-fips:latest"
132171
# --------------------------------------------------------------------------
133172
#
134173
# Internal targets:
@@ -291,7 +330,7 @@ mkexec = $(if $(findstring windows,$1),$1.exe,$1)
291330
installed_from_zip = $(if $(findstring split_sync,$1),split-sync,split-proxy)
292331
apptitle_from_zip = $(if $(findstring split_sync,$1),Synchronizer,Proxy)
293332
cmdfolder_from_bin = $(if $(findstring split_sync,$1),synchronizer,proxy)
294-
platform_str = $(if $(PLATFORM),--platform=$(PLATFORM),)
333+
platform_str = $(if $(PLATFORM),--platform $(PLATFORM),)
295334

296335
# "constants"
297336
null :=

‎docker/Dockerfile.proxy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build stage
2-
FROM golang:1.23.3-bookworm AS builder
2+
FROM golang:1.23.4-bookworm AS builder
33

44
ARG EXTRA_BUILD_ARGS
55
ARG FIPS_MODE

‎docker/Dockerfile.synchronizer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build stage
2-
FROM golang:1.23.3-bookworm AS builder
2+
FROM golang:1.23.4-bookworm AS builder
33

44
ARG EXTRA_BUILD_ARGS
55
ARG FIPS_MODE

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/splitio/split-synchronizer/v5
22

3-
go 1.23.3
3+
go 1.23.4
44

55
require (
66
github.com/gin-contrib/cors v1.6.0
@@ -44,11 +44,11 @@ require (
4444
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
4545
github.com/ugorji/go/codec v1.2.12 // indirect
4646
golang.org/x/arch v0.8.0 // indirect
47-
golang.org/x/crypto v0.23.0 // indirect
48-
golang.org/x/net v0.25.0 // indirect
49-
golang.org/x/sync v0.3.0 // indirect
50-
golang.org/x/sys v0.20.0 // indirect
51-
golang.org/x/text v0.15.0 // indirect
47+
golang.org/x/crypto v0.31.0 // indirect
48+
golang.org/x/net v0.33.0 // indirect
49+
golang.org/x/sync v0.10.0 // indirect
50+
golang.org/x/sys v0.28.0 // indirect
51+
golang.org/x/text v0.21.0 // indirect
5252
google.golang.org/protobuf v1.34.1 // indirect
5353
gopkg.in/yaml.v3 v3.0.1 // indirect
5454
)

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,29 +125,29 @@ golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUu
125125
golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
126126
golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
127127
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
128-
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
129-
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
128+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
129+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
130130
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
131131
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
132132
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
133-
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
134-
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
135-
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
136-
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
133+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
134+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
135+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
136+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
137137
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
138138
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
139139
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
140140
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
141141
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
142142
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
143143
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
144-
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
145-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
144+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
145+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
146146
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
147147
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
148148
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
149-
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
150-
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
149+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
150+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
151151
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
152152
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
153153
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=

‎splitio/commitversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ This file is created automatically, please do not edit
55
*/
66

77
// CommitVersion is the version of the last commit previous to release
8-
const CommitVersion = "8d090ac"
8+
const CommitVersion = "5792ac7"

0 commit comments

Comments
 (0)