Skip to content

Commit

Permalink
Merge branch 'main' of github.com:canonical/oci-factory into ROCKS-54…
Browse files Browse the repository at this point in the history
…3_charmed-oci-factory-we
  • Loading branch information
cjdcordeiro committed Oct 16, 2023
2 parents 6004dad + 1c79f83 commit bd98a55
Show file tree
Hide file tree
Showing 14 changed files with 214 additions and 14 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/Image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ jobs:
if-no-files-found: error

- name: Upload to GHCR
id: upload-image
env:
GHCR_REPO: ghcr.io/${{ github.repository_owner }}/oci-factory
GHCR_USERNAME: ${{ github.actor }}
Expand All @@ -403,6 +404,9 @@ jobs:
source="oci:${oci_images}"
digest="$(skopeo inspect $source | jq -r .Digest)"
echo "digest=$digest" >> $GITHUB_OUTPUT
./src/image/tag_and_publish.sh "${source}" \
${{ matrix.name }} \
${{ steps.rename-oci-archive.outputs.canonical-tag }}
Expand All @@ -417,7 +421,9 @@ jobs:
IMAGE_NAME: ${{ matrix.name }}
SWIFT_CONTAINER_NAME: ${{ vars.SWIFT_CONTAINER_NAME }}
run: |
jq <<< '${{ toJSON(matrix) }}' > build_metadata.json
jq --arg base "${{ steps.get-track.outputs.base }}" \
--arg digest "${{ steps.upload-image.outputs.digest }}" \
'. + {base: $base, digest: $digest}' <<< '${{ toJSON(matrix) }}' > build_metadata.json
./src/uploads/upload_to_swift.sh \
${{ matrix.name }} \
${{ steps.get-track.outputs.track }} \
Expand Down
4 changes: 4 additions & 0 deletions oci/grafana/.trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Upstream CVEs

# goproxy v1.1 was discovered to contain an issue which can lead to a Denial of service (DoS) via unspecified vectors.
CVE-2023-37788
44 changes: 44 additions & 0 deletions oci/grafana/_releases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"10.0.3-22.04": {
"stable": {
"target": "2"
},
"candidate": {
"target": "10.0.3-22.04_stable"
},
"beta": {
"target": "10.0.3-22.04_candidate"
},
"edge": {
"target": "10.0.3-22.04_beta"
}
},
"10.0-22.04": {
"stable": {
"target": "2"
},
"candidate": {
"target": "10.0-22.04_stable"
},
"beta": {
"target": "10.0-22.04_candidate"
},
"edge": {
"target": "10.0-22.04_beta"
}
},
"10-22.04": {
"stable": {
"target": "2"
},
"candidate": {
"target": "10-22.04_stable"
},
"beta": {
"target": "10-22.04_candidate"
},
"edge": {
"target": "10-22.04_beta"
}
}
}
6 changes: 6 additions & 0 deletions oci/loki/.trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Upstream CVEs

# github.com/docker/distribution - DoS from malicious API request
CVE-2023-2253
# github.com/docker/docker - Encrypted overlay network may be unauthenticated
CVE-2023-28840
44 changes: 44 additions & 0 deletions oci/loki/_releases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"2.8.4-22.04": {
"stable": {
"target": "1"
},
"candidate": {
"target": "2.8.4-22.04_stable"
},
"beta": {
"target": "2.8.4-22.04_candidate"
},
"edge": {
"target": "2.8.4-22.04_beta"
}
},
"2.8-22.04": {
"stable": {
"target": "1"
},
"candidate": {
"target": "2.8-22.04_stable"
},
"beta": {
"target": "2.8-22.04_candidate"
},
"edge": {
"target": "2.8-22.04_beta"
}
},
"2-22.04": {
"stable": {
"target": "1"
},
"candidate": {
"target": "2-22.04_stable"
},
"beta": {
"target": "2-22.04_candidate"
},
"edge": {
"target": "2-22.04_beta"
}
}
}
4 changes: 4 additions & 0 deletions oci/mimir/.trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Upstream CVEs

# golang.org/x/net - avoid quadratic complexity in HPACK decoding
CVE-2022-41723
44 changes: 44 additions & 0 deletions oci/mimir/_releases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"2.6.0-22.04": {
"stable": {
"target": "1"
},
"candidate": {
"target": "2.6.0-22.04_stable"
},
"beta": {
"target": "2.6.0-22.04_candidate"
},
"edge": {
"target": "2.6.0-22.04_beta"
}
},
"2.6-22.04": {
"stable": {
"target": "1"
},
"candidate": {
"target": "2.6-22.04_stable"
},
"beta": {
"target": "2.6-22.04_candidate"
},
"edge": {
"target": "2.6-22.04_beta"
}
},
"2-22.04": {
"stable": {
"target": "1"
},
"candidate": {
"target": "2-22.04_stable"
},
"beta": {
"target": "2-22.04_candidate"
},
"edge": {
"target": "2-22.04_beta"
}
}
}
4 changes: 2 additions & 2 deletions oci/mock-docker-image/_releases.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"1.3-22.04": {
"beta": {
"target": "214"
"target": "216"
},
"edge": {
"target": "1.3-22.04_beta"
}
},
"1.3": {
"edge": {
"target": "214"
"target": "216"
}
}
}
6 changes: 3 additions & 3 deletions oci/mock-rock/_releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
},
"1.0-22.04": {
"candidate": {
"target": "124"
"target": "125"
},
"beta": {
"target": "124"
"target": "125"
},
"edge": {
"target": "124"
"target": "125"
}
},
"test": {
Expand Down
6 changes: 3 additions & 3 deletions oci/prometheus/_releases.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"2.46.0-22.04": {
"stable": {
"target": "2"
"target": "3"
},
"candidate": {
"target": "2.46.0-22.04_stable"
Expand All @@ -15,7 +15,7 @@
},
"2.46-22.04": {
"stable": {
"target": "2"
"target": "3"
},
"candidate": {
"target": "2.46-22.04_stable"
Expand All @@ -29,7 +29,7 @@
},
"2-22.04": {
"stable": {
"target": "2"
"target": "3"
},
"candidate": {
"target": "2-22.04_stable"
Expand Down
9 changes: 4 additions & 5 deletions oci/prometheus/image.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
version: 1

upload:
- source: canonical/prometheus-rock
commit: c7a8b4eeaf34b1bf7f7cb7bdf71e90369fb60031
commit: 4521b60dec190d3254901de3d9d2147cf806dc2b
directory: 2.46.0
release:
2.46.0-22.04:
end-of-life: "2024-08-01T00:00:00Z"
end-of-life: "2024-09-08T00:00:00Z"
risks:
- stable
2.46-22.04:
end-of-life: "2024-08-01T00:00:00Z"
end-of-life: "2024-09-08T00:00:00Z"
risks:
- stable
2-22.04:
end-of-life: "2024-08-01T00:00:00Z"
end-of-life: "2024-09-08T00:00:00Z"
risks:
- stable
4 changes: 4 additions & 0 deletions oci/traefik/.trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Upstream CVEs

# github.com/docker/docker - Encrypted overlay network may be unauthenticated
CVE-2023-28840
44 changes: 44 additions & 0 deletions oci/traefik/_releases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"2.10.4-22.04": {
"stable": {
"target": "1"
},
"candidate": {
"target": "2.10.4-22.04_stable"
},
"beta": {
"target": "2.10.4-22.04_candidate"
},
"edge": {
"target": "2.10.4-22.04_beta"
}
},
"2.10-22.04": {
"stable": {
"target": "1"
},
"candidate": {
"target": "2.10-22.04_stable"
},
"beta": {
"target": "2.10-22.04_candidate"
},
"edge": {
"target": "2.10-22.04_beta"
}
},
"2-22.04": {
"stable": {
"target": "1"
},
"candidate": {
"target": "2-22.04_stable"
},
"beta": {
"target": "2-22.04_candidate"
},
"edge": {
"target": "2-22.04_beta"
}
}
}
1 change: 1 addition & 0 deletions src/uploads/infer_image_track.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ def get_release_from_codename(codename: str) -> str:

with open(os.environ["GITHUB_OUTPUT"], "a") as gh_out:
print(f"track={track}", file=gh_out)
print(f"base=ubuntu:{base_release}", file=gh_out)

0 comments on commit bd98a55

Please sign in to comment.