Skip to content

Commit 3767daf

Browse files
authored
Adds CA certs
1 parent 0abce91 commit 3767daf

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ COPY --from=deps /sbin/mount.nfs /sbin/mount.nfs4 /sbin/
3131
COPY --from=deps /etc/netconfig /etc/
3232
COPY --from=deps /nfs-deps/ /
3333

34+
COPY --from=deps /etc/ssl/certs/ /etc/ssl/certs/
35+
3436
ARG BIN=trident_orchestrator
3537
ARG CLI_BIN=tridentctl
3638
ARG CHWRAP_BIN=chwrap.tar

contrib/docker/plugin/Dockerfile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
FROM busybox:uclibc as busybox
1+
FROM alpine:3 AS deps
2+
3+
RUN mkdir /netapp
4+
RUN mkdir -p /var/lib/docker-volumes/netapp
25

36
FROM scratch
47

58
LABEL maintainers="The NetApp Trident Team" \
69
app="trident.netapp.io" \
710
description="Trident Storage Orchestrator"
811

9-
COPY --from=busybox /bin/sh /bin/mkdir /bin/ln /bin/rm /usr/bin/
10-
SHELL ["/usr/bin/sh", "-c"]
11-
12-
RUN /usr/bin/mkdir /netapp
13-
RUN /usr/bin/mkdir -p /var/lib/docker-volumes/netapp
14-
15-
RUN /usr/bin/rm /usr/bin/*
12+
COPY --from=deps /etc/ssl/certs/ /etc/ssl/certs/
13+
COPY --from=deps /netapp /netapp
14+
COPY --from=deps /var/lib/docker-volumes/netapp /var/lib/docker-volumes/netapp
1615

1716
ARG BIN=trident
18-
ENV BIN $BIN
19-
ENV DOCKER_PLUGIN_MODE 1
17+
ENV BIN=$BIN
18+
ENV DOCKER_PLUGIN_MODE=1
2019

2120
COPY $BIN /netapp
2221
ADD chwrap.tar /

0 commit comments

Comments
 (0)