Fixes

oracle · Nov 20, 2024 · 08c8172 · 08c8172
1 parent 4743305
commit 08c8172
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: '1.20'
+          go-version: '1.22.9'
         id: go
 
       - name: Check out code into the Go module directory
@@ -25,5 +25,5 @@ jobs:
         env:
           COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          GO111MODULE=off go get github.com/mattn/goveralls
+          GO111MODULE=auto go get github.com/mattn/goveralls
           $(go env GOPATH)/bin/goveralls -coverprofile=profile.cov -service=github
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -26,7 +26,7 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
 
       - name: Build Image
-        run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image
+        run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image
 
       - name: Push Image
-        run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all
+        run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@
 
 ARG CI_IMAGE_REGISTRY
 
-FROM golang:1.22.8 as builder
+FROM golang:1.22.9 as builder
 
 ARG COMPONENT
 
@@ -27,7 +27,7 @@ WORKDIR $SRC
 
 RUN COMPONENT=${COMPONENT} make clean build
 
-FROM oraclelinux:8-slim
+FROM ghcr.io/oracle/oraclelinux:8-slim-fips
 
 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/

diff --git a/Dockerfile_arm_all b/Dockerfile_arm_all
@@ -1,6 +1,6 @@
 ARG CI_IMAGE_REGISTRY
 
-FROM golang:1.21.5 as builder
+FROM golang:1.22.9 as builder
 
 ARG COMPONENT
 
@@ -14,7 +14,7 @@ WORKDIR $SRC
 
 RUN ARCH=arm make clean build-arm-all
 
-FROM arm64v8/oraclelinux:8-slim
+FROM ghcr.io/oracle/oraclelinux:8-slim-fips-arm64v8
 
 RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
     microdnf update && \
@@ -29,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/