Skip to content

Commit

Permalink
Merge pull request #685 from yiannistri/bump-image-version-release-v2.7
Browse files Browse the repository at this point in the history
[v2.7] Bump image version
  • Loading branch information
mjura authored Oct 9, 2024
2 parents b085e75 + 29dbae5 commit 8fd7989
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ jobs:
with:
fetch-depth: 0
ref: ${{ github.ref_name}}
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
check-latest: true
- name: Build and push all image variations
run: |
make operator
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/scan.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Scan
on:
pull_request:
branches:
- release-v2.7
push:
branches:
- master
- release-v2.7
tags:
- "v*"
jobs:
Expand All @@ -14,6 +16,13 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
check-latest: true
- name: Build operator
run: make operator
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.9.1
Expand All @@ -24,7 +33,7 @@ jobs:
tags: ghcr.io/rancher/aks-operator:${{ github.sha }}
load: true
push: false
file: test/e2e/Dockerfile.e2e
file: package/Dockerfile
build-args: |
TAG=${{ github.sha }}
REPO=ghcr.io/rancher/aks-operator
Expand Down
3 changes: 2 additions & 1 deletion .trivyignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Requires upgrading to Go 1.21 but we can't do this before Rancher v2.7 gets updated
CVE-2023-45288
CVE-2024-24790
CVE-2024-24790
CVE-2024-34156
4 changes: 2 additions & 2 deletions package/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM registry.suse.com/bci/bci-base:15.5 AS builder
FROM registry.suse.com/bci/bci-base:15.6 AS builder
RUN sed -i 's/^CREATE_MAIL_SPOOL=yes/CREATE_MAIL_SPOOL=no/' /etc/default/useradd
RUN useradd --uid 1007 aks-operator

FROM registry.suse.com/bci/bci-micro:15.5
FROM registry.suse.com/bci/bci-micro:15.6
COPY --from=builder /etc/passwd /etc/passwd
COPY --from=builder /etc/shadow /etc/shadow

Expand Down

0 comments on commit 8fd7989

Please sign in to comment.