diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index 4500952..cd8dd32 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run the formatter, linter, and vetter uses: dell/common-github-actions/go-code-formatter-linter-vetter@main with: @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run the forbidden words scan uses: dell/common-github-actions/code-sanitizer@main with: @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run unit tests and check package coverage uses: dell/common-github-actions/go-code-tester@main with: @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run Go Security uses: securego/gosec@master with: @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run malware scan uses: dell/common-github-actions/malware-scanner@main with: @@ -60,13 +60,11 @@ jobs: name: Image Scanner runs-on: ubuntu-latest steps: - - name: Set up Go 1.21+ - uses: actions/setup-go@v2 - with: - go-version: ^1.21 + - name: Set up Go lastest + uses: actions/setup-go@v5 id: go - name: Checkout the code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install Mockgen run: go install github.com/golang/mock/mockgen@v1.4.4 - name: Get dependencies diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml index e7aad32..43ece07 100644 --- a/.github/workflows/linters.yaml +++ b/.github/workflows/linters.yaml @@ -14,12 +14,12 @@ jobs: name: golangci-lint runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" cache: false - name: Checkout the code - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v4 - name: Vendor packages run: | go mod vendor diff --git a/Dockerfile b/Dockerfile index 37aab0b..d2178fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ ARG BASEIMAGE +ARG GOIMAGE # Build the sdk binary -FROM golang:1.21 as builder +FROM $GOIMAGE as builder # Set envirment variable ENV APP_NAME csm-topology diff --git a/Makefile b/Makefile index 2a45ce1..6fb6eaf 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ test: .PHONY: docker docker: download-csm-common $(eval include csm-common.mk) - docker build -t csm-topology -f Dockerfile --build-arg BASEIMAGE=$(DEFAULT_BASEIMAGE) . + docker build -t csm-topology -f Dockerfile --build-arg BASEIMAGE=$(DEFAULT_BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) . .PHONY: tag tag: