Skip to content

Commit

Permalink
Dockerfile changes
Browse files Browse the repository at this point in the history
  • Loading branch information
YashwantGohokar committed Jun 28, 2024
1 parent e25ffcd commit 1a2d8d9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ WORKDIR $SRC

RUN COMPONENT=${COMPONENT} make clean build

FROM oraclelinux:8
FROM oraclelinux:8-slim

COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/image/* /usr/local/bin/

RUN yum install -y util-linux \
&& yum install -y e2fsprogs \
&& yum install -y xfsprogs \
&& yum clean all
RUN microdnf -y install util-linux \
&& microdnf -y install e2fsprogs \
&& microdnf -y install xfsprogs \
&& microdnf clean all

COPY scripts/encrypt-mount /sbin/encrypt-mount
COPY scripts/encrypt-umount /sbin/encrypt-umount
Expand Down
15 changes: 9 additions & 6 deletions Dockerfile_arm_all
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG CI_IMAGE_REGISTRY

FROM golang:1.20.4 as builder
FROM golang:1.21.5 as builder

ARG COMPONENT

Expand All @@ -14,12 +14,15 @@ WORKDIR $SRC

RUN ARCH=arm make clean build-arm-all

FROM arm64v8/oraclelinux:7-slim
FROM arm64v8/oraclelinux:8-slim

RUN yum install -y util-linux \
&& yum install -y e2fsprogs \
&& yum clean all
\
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/image/* /usr/local/bin/

RUN microdnf -y install util-linux \
&& microdnf -y install e2fsprogs \
&& microdnf -y install xfsprogs \
&& microdnf clean all

COPY scripts/encrypt-mount /sbin/encrypt-mount
COPY scripts/encrypt-umount /sbin/encrypt-umount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ spec:
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
command:
- /usr/local/bin/oci-csi-controller-driver
image: gghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.0
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.0
imagePullPolicy: IfNotPresent
volumeMounts:
- name: config
Expand Down

0 comments on commit 1a2d8d9

Please sign in to comment.