Skip to content

Commit dfc3fb6

Browse files
committed
Fixes
1 parent d89e37b commit dfc3fb6

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

.github/workflows/makefile.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,21 @@ jobs:
1212
- name: Set up Go 1.x
1313
uses: actions/setup-go@v2
1414
with:
15-
go-version: '1.20'
15+
go-version: '1.22.9'
1616
id: go
1717

1818
- name: Check out code into the Go module directory
1919
uses: actions/checkout@v2
20-
20+
- name: Install dependencies
21+
run: |
22+
go mod download
2123
- name: Run Unit Tests
2224
run: |
2325
go test -covermode=count -coverprofile=profile.cov ./pkg/...
26+
- name: Install goveralls
27+
run: go install github.com/mattn/goveralls@latest
2428
- name: Send coverage
2529
env:
2630
COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2731
run: |
28-
GO111MODULE=off go get github.com/mattn/goveralls
29-
$(go env GOPATH)/bin/goveralls -coverprofile=profile.cov -service=github
32+
goveralls -coverprofile=profile.cov -service=github

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
2727

2828
- name: Build Image
29-
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image
29+
run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image
3030

3131
- name: Push Image
32-
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all
32+
run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
ARG CI_IMAGE_REGISTRY
1616

17-
FROM golang:1.22.8 as builder
17+
FROM golang:1.22.9 as builder
1818

1919
ARG COMPONENT
2020

@@ -27,7 +27,7 @@ WORKDIR $SRC
2727

2828
RUN COMPONENT=${COMPONENT} make clean build
2929

30-
FROM oraclelinux:8-slim
30+
FROM ghcr.io/oracle/oraclelinux:8-slim-fips
3131

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

Dockerfile_arm_all

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CI_IMAGE_REGISTRY
22

3-
FROM golang:1.21.5 as builder
3+
FROM golang:1.22.9 as builder
44

55
ARG COMPONENT
66

@@ -14,7 +14,7 @@ WORKDIR $SRC
1414

1515
RUN ARCH=arm make clean build-arm-all
1616

17-
FROM arm64v8/oraclelinux:8-slim
17+
FROM ghcr.io/oracle/oraclelinux:8-slim-fips-arm64v8
1818

1919
RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
2020
microdnf update && \
@@ -29,4 +29,4 @@ RUN chmod 755 /sbin/encrypt-umount
2929
RUN chmod 755 /sbin/rpm-host
3030
RUN chmod 755 /sbin/chroot-bash
3131

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

0 commit comments

Comments
 (0)