Dockerfile changes

YashwantGohokar · Jun 30, 2024 · 9cd2c85 · 9cd2c85
1 parent e25ffcd
commit 9cd2c85
Show file tree

Hide file tree

Showing 44 changed files with 3,693 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -27,24 +27,22 @@ 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 e2fsprogs xfsprogs && \
+    microdnf update && \
+    microdnf clean all
 
 COPY scripts/encrypt-mount /sbin/encrypt-mount
 COPY scripts/encrypt-umount /sbin/encrypt-umount
 COPY scripts/rpm-host /sbin/rpm-host
 COPY scripts/chroot-bash /sbin/chroot-bash
-
 RUN chmod 755 /sbin/encrypt-mount
 RUN chmod 755 /sbin/encrypt-umount
 RUN chmod 755 /sbin/rpm-host
 RUN chmod 755 /sbin/chroot-bash
 
-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/dist/* /usr/local/bin/
diff --git a/Dockerfile_arm_all b/Dockerfile_arm_all
@@ -1,6 +1,6 @@
 ARG CI_IMAGE_REGISTRY
 
-FROM golang:1.20.4 as builder
+FROM golang:1.21.5 as builder
 
 ARG COMPONENT
 
@@ -14,12 +14,11 @@ 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
- \
+RUN microdnf -y install util-linux e2fsprogs xfsprogs && \
+    microdnf update && \
+    microdnf clean all
 
 COPY scripts/encrypt-mount /sbin/encrypt-mount
 COPY scripts/encrypt-umount /sbin/encrypt-umount
@@ -30,4 +29,4 @@ RUN chmod 755 /sbin/encrypt-umount
 RUN chmod 755 /sbin/rpm-host
 RUN chmod 755 /sbin/chroot-bash
 
-COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/
+COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/
diff --git a/manifests/container-storage-interface/oci-csi-controller-driver.yaml b/manifests/container-storage-interface/oci-csi-controller-driver.yaml
@@ -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

diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/common/sseReader.go b/vendor/github.com/oracle/oci-go-sdk/v65/common/sseReader.go
diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/core/address_type.go b/vendor/github.com/oracle/oci-go-sdk/v65/core/address_type.go
diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/core/amd_vm_update_instance_platform_config.go b/vendor/github.com/oracle/oci-go-sdk/v65/core/amd_vm_update_instance_platform_config.go
diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/core/get_ip_inventory_vcn_overlap_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/core/get_ip_inventory_vcn_overlap_details.go