Skip to content

Commit 5650bb0

Browse files
authored
Adds CA certs to operator
1 parent c1b1262 commit 5650bb0

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN --mount=type=secret,id=activation_key,env=ACTIVATION_KEY \
1717
fi; \
1818
# Copy real certificates \
1919
mkdir /real-certs; \
20-
cp -L /etc/ssl/certs/* /real-certs/;
20+
cp -L /etc/ssl/certs/* /real-certs/
2121

2222
# Get the mount.nfs4 dependency
2323
RUN ldd /sbin/mount.nfs4 | tr -s '[:space:]' '\n' | grep '^/' | xargs -I % sh -c 'mkdir -p /nfs-deps/$(dirname %) && cp -L % /nfs-deps/%'

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ docker_build_windows = $1 build \
275275
docker_build_operator = $1 build \
276276
--platform $2 \
277277
--file operator/Dockerfile \
278-
--build-arg ARCH=$(call arch,$2) \
279278
--build-arg BIN=$(call binary_path,trident-operator,$2) \
279+
$(if $(TRIDENT_DEPS_IMAGE),--build-arg DEPS_IMAGE=$(TRIDENT_DEPS_IMAGE)) \
280280
--tag $3 \
281281
--rm \
282282
$(if $(findstring $(DOCKER_BUILDX_BUILD_CLI),$1),--builder trident-builder) \

operator/Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1+
# Image for dependencies such as CA certificates
2+
ARG DEPS_IMAGE=alpine:3
3+
4+
FROM $DEPS_IMAGE AS deps
5+
6+
RUN mkdir /real-certs; \
7+
cp -L /etc/ssl/certs/* /real-certs/
8+
19
FROM scratch
210

311
LABEL maintainers="The NetApp Trident Team" \
412
app="trident-operator.netapp.io" description="Trident Operator"
513

614
ARG BIN=trident-operator
715

16+
COPY --from=deps /real-certs/ /etc/ssl/certs/
817
COPY ${BIN} /trident-operator
918

1019
ENTRYPOINT ["/trident-operator"]

0 commit comments

Comments
 (0)