Skip to content

Commit 12260e8

Browse files
committed
update debian
2 parents 49985b8 + d497098 commit 12260e8

File tree

5 files changed

+46
-6
lines changed

5 files changed

+46
-6
lines changed

CHANGES.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
5.10.0 (Jan 17, 2024)
1+
5.10.0 (Jan 20, 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 in docker images.
34
- Fixed vulnerabilities:
45
- Updated golang image to 1.23.5
56
- Updated golang.org/x/net to 0.33.0

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
@@ -17,7 +17,7 @@ RUN bash -c 'if [[ "${FIPS_MODE}" = "enabled" ]]; \
1717
fi'
1818

1919
# Runner stage
20-
FROM debian:12.8 AS runner
20+
FROM debian:12.9 AS runner
2121

2222
RUN apt update -y
2323
RUN apt install -y bash ca-certificates

docker/Dockerfile.synchronizer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN bash -c 'if [[ "${FIPS_MODE}" = "enabled" ]]; \
1717
fi'
1818

1919
# Runner stage
20-
FROM debian:12.8 AS runner
20+
FROM debian:12.9 AS runner
2121

2222
RUN apt update -y
2323
RUN apt install -y bash ca-certificates

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)