Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
linostar authored Jun 24, 2024
2 parents 99bc4a7 + ecb8731 commit ed810ed
Show file tree
Hide file tree
Showing 16 changed files with 249 additions and 249 deletions.
2 changes: 1 addition & 1 deletion .github/base_digests/22.04
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
public.ecr.aws/ubuntu/ubuntu:jammy@sha256:1cc4019c277242e5fb710f2cf40af1590ad053b7d764efba48b051871dcc18d8
public.ecr.aws/ubuntu/ubuntu:jammy@sha256:289c8c222907130df84230b590c52fac0489e8337d214c03d8f424668535cce6

6 changes: 3 additions & 3 deletions .github/workflows/Tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ on:
env:
TEST_IMAGE_NAME: 'test-img'
TEST_IMAGE_TAG: 'test'
SKOPEO_IMAGE: 'quay.io/skopeo/stable:v1.13'
SKOPEO_IMAGE: 'quay.io/skopeo/stable:v1.15.1'
UMOCI_VERSION: 'v0.4.7'
UMOCI_BINARY: 'umoci.amd64'
DIVE_IMAGE: 'wagoodman/dive:v0.10'
DIVE_IMAGE: 'wagoodman/dive:v0.12'

jobs:
fetch-oci-image:
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
test-vulnerabilities:
name: Vulnerability scan
needs: [fetch-oci-image]
uses: canonical/oci-factory/.github/workflows/Vulnerability-Scan.yaml@main
uses: ./.github/workflows/Vulnerability-Scan.yaml
with:
oci-image-name: "${{ inputs.oci-image-name }}"
oci-image-path: "${{ inputs.oci-image-path }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Vulnerability-Scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ on:
env:
TEST_IMAGE_NAME: 'test-img'
TEST_IMAGE_TAG: 'test'
SKOPEO_IMAGE: 'quay.io/skopeo/stable:v1.13'
SKOPEO_IMAGE: 'quay.io/skopeo/stable:v1.15.1'

jobs:
test-vulnerabilities:
Expand Down
56 changes: 28 additions & 28 deletions oci/alertmanager/_releases.json
Original file line number Diff line number Diff line change
@@ -1,107 +1,107 @@
{
"0.25.0-22.04": {
"stable": {
"target": "41"
"target": "44"
},
"candidate": {
"target": "41"
"target": "44"
},
"beta": {
"target": "41"
"target": "44"
},
"edge": {
"target": "41"
"target": "44"
},
"end-of-life": "2025-03-13T00:00:00Z"
},
"0.25-22.04": {
"stable": {
"target": "41"
"target": "44"
},
"candidate": {
"target": "41"
"target": "44"
},
"beta": {
"target": "41"
"target": "44"
},
"edge": {
"target": "41"
"target": "44"
},
"end-of-life": "2025-03-13T00:00:00Z"
},
"0-22.04": {
"stable": {
"target": "43"
"target": "46"
},
"candidate": {
"target": "43"
"target": "46"
},
"beta": {
"target": "43"
"target": "46"
},
"edge": {
"target": "43"
"target": "46"
},
"end-of-life": "2025-03-13T00:00:00Z"
},
"0.26.0-22.04": {
"stable": {
"target": "42"
"target": "45"
},
"candidate": {
"target": "42"
"target": "45"
},
"beta": {
"target": "42"
"target": "45"
},
"edge": {
"target": "42"
"target": "45"
},
"end-of-life": "2025-03-13T00:00:00Z"
},
"0.26-22.04": {
"stable": {
"target": "42"
"target": "45"
},
"candidate": {
"target": "42"
"target": "45"
},
"beta": {
"target": "42"
"target": "45"
},
"edge": {
"target": "42"
"target": "45"
},
"end-of-life": "2025-03-13T00:00:00Z"
},
"0.27.0-22.04": {
"end-of-life": "2025-03-13T00:00:00Z",
"stable": {
"target": "43"
"target": "46"
},
"candidate": {
"target": "43"
"target": "46"
},
"beta": {
"target": "43"
"target": "46"
},
"edge": {
"target": "43"
"target": "46"
}
},
"0.27-22.04": {
"end-of-life": "2025-03-13T00:00:00Z",
"stable": {
"target": "43"
"target": "46"
},
"candidate": {
"target": "43"
"target": "46"
},
"beta": {
"target": "43"
"target": "46"
},
"edge": {
"target": "43"
"target": "46"
}
}
}
4 changes: 2 additions & 2 deletions oci/kafka/_releases.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"3.6-22.04": {
"end-of-life": "2024-05-01T00:00:00Z",
"end-of-life": "2024-09-01T00:00:00Z",
"edge": {
"target": "5"
"target": "7"
}
}
}
2 changes: 1 addition & 1 deletion oci/kafka/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ upload:
directory: .
release:
3.6-22.04:
end-of-life: "2024-05-01T00:00:00Z"
end-of-life: "2024-09-01T00:00:00Z"
risks:
- edge
16 changes: 8 additions & 8 deletions oci/karma/_releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
"0.120-22.04": {
"end-of-life": "2025-04-19T00:00:00Z",
"stable": {
"target": "3"
"target": "4"
},
"candidate": {
"target": "3"
"target": "4"
},
"beta": {
"target": "3"
"target": "4"
},
"edge": {
"target": "3"
"target": "4"
}
},
"0-22.04": {
"end-of-life": "2025-04-19T00:00:00Z",
"stable": {
"target": "3"
"target": "4"
},
"candidate": {
"target": "3"
"target": "4"
},
"beta": {
"target": "3"
"target": "4"
},
"edge": {
"target": "3"
"target": "4"
}
}
}
Loading

0 comments on commit ed810ed

Please sign in to comment.