Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(build): use no ssl image #5560

Merged
merged 6 commits into from
Jan 31, 2023
Merged

feat(build): use no ssl image #5560

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cda4ad3
feat(build): use no ssl image
slonka Jan 3, 2023
c9dca4d
Merge branch 'master' into feat/use-non-openssl-image
slonka Jan 4, 2023
b9ee219
Merge branch 'master' into feat/use-non-openssl-image
slonka Jan 5, 2023
469ae8e
Merge branch 'master' into feat/use-non-openssl-image
slonka Jan 16, 2023
3596f87
Merge branch 'master' into feat/use-non-openssl-image
slonka Jan 17, 2023
26146fa
Merge branch 'master' into feat/use-non-openssl-image
slonka Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mk/docker.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ define build_image
$(DOCKER_REGISTRY)/$(1):$(BUILD_INFO_VERSION)$(if $(IMAGE_ARCH_TAG_ENABLED),-${GOARCH},)
endef

export KUMA_BASE_IMAGE ?= kumahq/base-debian11:no-push
export KUMA_BASE_IMAGE ?= kumahq/base-nossl-debian11:no-push
lahabana marked this conversation as resolved.
Show resolved Hide resolved
export KUMA_BASE_ROOT_IMAGE ?= kumahq/base-root-debian11:no-push
export KUMA_STATIC_IMAGE ?= kumahq/static-debian11:no-push
export KUMA_ENVOY_IMAGE ?= kumahq/envoy:no-push
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/dockerfiles/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/distroless/base-debian11:debug-nonroot
FROM gcr.io/distroless/base-nossl-debian11:debug-nonroot

COPY /tools/releases/templates/LICENSE \
/tools/releases/templates/README \
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/dockerfiles/Dockerfile.base-root
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# use only when root is really needed
FROM gcr.io/distroless/base-debian11:debug
FROM gcr.io/distroless/base-nossl-debian11:debug

COPY /tools/releases/templates/LICENSE \
/tools/releases/templates/README \
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/dockerfiles/Dockerfile.kuma-dp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM kumahq/envoy:no-push as envoy
FROM kumahq/base-debian11:no-push
FROM kumahq/base-nossl-debian11:no-push
ARG ARCH

COPY /build/artifacts-linux-$ARCH/kuma-dp/kuma-dp \
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/dockerfiles/Dockerfile.kumactl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM kumahq/base-debian11:no-push
FROM kumahq/base-nossl-debian11:no-push
ARG ARCH

# override NOTICE
Expand Down