Skip to content

Commit

Permalink
Ensure single newline between certs
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
tamalsaha committed May 24, 2024
1 parent 8e31e4e commit 1919c2c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ FROM {ARG_FROM}
LABEL org.opencontainers.image.source https://github.com/kubeops/csi-driver-cacerts

RUN set -x \
&& apk add --update ca-certificates
&& apt-get update \
&& apt-get install -y --no-install-recommends apt-transport-https ca-certificates

ADD bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}
COPY --from=java /etc/ssl/certs/java/cacerts /etc/ssl/certs/java/cacerts
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))

# BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12
BASEIMAGE_PROD ?= alpine
BASEIMAGE_PROD ?= debian:bookworm
BASEIMAGE_DBG ?= debian:bookworm

IMAGE := $(REGISTRY)/$(BIN)
Expand Down

0 comments on commit 1919c2c

Please sign in to comment.