Skip to content

Commit

Permalink
move cinder-csi-plugin to the bottom of Dockerfile to fix our broken …
Browse files Browse the repository at this point in the history
…concourse

Signed-off-by: Niclas Schad <niclas.schad@stackit.de>
  • Loading branch information
Niclas Schad committed Dec 1, 2023
1 parent 68853da commit 07f1f9f
Showing 1 changed file with 22 additions and 21 deletions.
43 changes: 22 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,27 +103,6 @@ LABEL name="barbican-kms-plugin" \

CMD ["sh", "-c", "/bin/barbican-kms-plugin --socketpath ${socketpath} --cloud-config ${cloudconfig}"]

##
## cinder-csi-plugin
##
FROM --platform=${TARGETPLATFORM} ${DEBIAN_IMAGE} as cinder-csi-plugin

# Install e4fsprogs for format
RUN clean-install btrfs-progs e2fsprogs mount udev xfsprogs

COPY --from=builder /build/cinder-csi-plugin /bin/cinder-csi-plugin
COPY --from=certs /etc/ssl/certs /etc/ssl/certs

LABEL name="cinder-csi-plugin" \
license="Apache Version 2.0" \
maintainers="Kubernetes Authors" \
description="Cinder CSI Plugin" \
distribution-scope="public" \
summary="Cinder CSI Plugin" \
help="none"

CMD ["/bin/cinder-csi-plugin"]

##
## k8s-keystone-auth
##
Expand Down Expand Up @@ -200,3 +179,25 @@ LABEL name="octavia-ingress-controller" \
help="none"

CMD ["/bin/octavia-ingress-controller"]

##
## cinder-csi-plugin
##
## SKE: Concourse only pushes the last built image. Therefore we have to move this to the bottom.
FROM --platform=${TARGETPLATFORM} ${DEBIAN_IMAGE} as cinder-csi-plugin

# Install e4fsprogs for format
RUN clean-install btrfs-progs e2fsprogs mount udev xfsprogs

COPY --from=builder /build/cinder-csi-plugin /bin/cinder-csi-plugin
COPY --from=certs /etc/ssl/certs /etc/ssl/certs

LABEL name="cinder-csi-plugin" \
license="Apache Version 2.0" \
maintainers="Kubernetes Authors" \
description="Cinder CSI Plugin" \
distribution-scope="public" \
summary="Cinder CSI Plugin" \
help="none"

CMD ["/bin/cinder-csi-plugin"]

0 comments on commit 07f1f9f

Please sign in to comment.