Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

Commit

Permalink
Bump openjdk-11 version in blobstore image (#64047)
Browse files Browse the repository at this point in the history
<!-- PR description tips:
https://www.notion.so/sourcegraph/Write-a-good-pull-request-description-610a7fd3e613496eb76f450db5a49b6e
-->
Update the version of openjdk-11 we use in the blobstore image.

We updated the blobstore image earlier today to try and fix this issue,
but were thwarted by an old version pin. This has now been
[removed](https://github.com/sourcegraph/sourcegraph/pull/64045), so
updating packages fully resolves the issue.

This PR branch is not based off `main` as backporting package changes
often results in merge conflicts. It was generated by checking our
`5.5.x` and running `sg wolfi lock blobstore`.

## Test plan

- CI
- Run image locally

<!-- REQUIRED; info at
https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles
-->

## Changelog

<!-- OPTIONAL; info at
https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c
-->
  • Loading branch information
willdollman authored Jul 24, 2024
1 parent a88bc4d commit fa826c3
Showing 1 changed file with 28 additions and 47 deletions.
75 changes: 28 additions & 47 deletions wolfi-images/blobstore.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -848,25 +848,6 @@
"url": "https://packages.wolfi.dev/os/x86_64/libfontconfig1-2.15.0-r1.apk",
"version": "2.15.0-r1"
},
{
"architecture": "x86_64",
"checksum": "Q1AbMOLCk6tZeAxTVVT18Hjuq9ICA=",
"control": {
"checksum": "sha1-AbMOLCk6tZeAxTVVT18Hjuq9ICA=",
"range": "bytes=706-1263"
},
"data": {
"checksum": "sha256-8hX1Coe+PgFhWcoKnU2gKloQIVpRYCCurkVuhkqEjSI=",
"range": "bytes=1264-203887"
},
"name": "fontconfig",
"signature": {
"checksum": "sha1-L+pYcv0XxYFNaL8CDwz7N4QdHjg=",
"range": "bytes=0-705"
},
"url": "https://packages.wolfi.dev/os/x86_64/fontconfig-2.15.0-r1.apk",
"version": "2.15.0-r1"
},
{
"architecture": "x86_64",
"checksum": "Q1Y8qzLT9CwROUfB6S/+OCSabT9X0=",
Expand Down Expand Up @@ -1038,25 +1019,6 @@
"url": "https://packages.wolfi.dev/os/x86_64/openjdk-11-jre-11.0.24-r0.apk",
"version": "11.0.24-r0"
},
{
"architecture": "x86_64",
"checksum": "Q1ntwd0U1+FDplQrJgf02kehE4jzA=",
"control": {
"checksum": "sha1-ntwd0U1+FDplQrJgf02kehE4jzA=",
"range": "bytes=661-1037"
},
"data": {
"checksum": "sha256-xW9D/0ZRSG6Q6ibItUSX/09Sf5z8dYPrmJaCaiv+/so=",
"range": "bytes=1038-619411"
},
"name": "openjdk-11",
"signature": {
"checksum": "sha1-GvP0A1icdBQ034IwFh2R0cB6ILw=",
"range": "bytes=0-660"
},
"url": "https://packages.wolfi.dev/os/x86_64/openjdk-11-11.0.20.4-r0.apk",
"version": "11.0.20.4-r0"
},
{
"architecture": "x86_64",
"checksum": "Q1U4lQ/1tfu0YohyxOxbBErxbpaio=",
Expand All @@ -1078,22 +1040,41 @@
},
{
"architecture": "x86_64",
"checksum": "Q1UmIT03dVv5Dghsv5v0ZCvsloxGI=",
"checksum": "Q1gihecR67KvYZn0Pk85WmxLYwtE0=",
"control": {
"checksum": "sha1-UmIT03dVv5Dghsv5v0ZCvsloxGI=",
"range": "bytes=657-999"
"checksum": "sha1-gihecR67KvYZn0Pk85WmxLYwtE0=",
"range": "bytes=700-1053"
},
"data": {
"checksum": "sha256-uEPvYq1n0/JMDIciXRXjReRD27P/ShP19msWn7yZO64=",
"range": "bytes=1000-48363395"
"checksum": "sha256-+OBti1i0Yk/MjPofKdDYC5TkAJ+aPOeheDIYvozVKsc=",
"range": "bytes=1054-590045"
},
"name": "openjdk-11",
"signature": {
"checksum": "sha1-O45lVwmg94/QxlIKrwXyX+dcGWY=",
"range": "bytes=0-699"
},
"url": "https://packages.wolfi.dev/os/x86_64/openjdk-11-11.0.24-r0.apk",
"version": "11.0.24-r0"
},
{
"architecture": "x86_64",
"checksum": "Q1QNqE8jUgFWO1zrxzErRr2lAgnIA=",
"control": {
"checksum": "sha1-QNqE8jUgFWO1zrxzErRr2lAgnIA=",
"range": "bytes=661-993"
},
"data": {
"checksum": "sha256-P9lwloTDYWriwF9KhB4C+eoXjONtzXNM+v/TPb8n8sc=",
"range": "bytes=994-48363450"
},
"name": "s3proxy",
"signature": {
"checksum": "sha1-8sB0XCL8VM9V50sHFyVk1cgwZ+Y=",
"range": "bytes=0-656"
"checksum": "sha1-LC8HymAKsNQOA23tzIJQqobn+9w=",
"range": "bytes=0-660"
},
"url": "https://packages.sgdev.org/main/x86_64/s3proxy-2.0.0-r5.apk",
"version": "2.0.0-r5"
"url": "https://packages.sgdev.org/main/x86_64/s3proxy-2.0.0-r6.apk",
"version": "2.0.0-r6"
},
{
"architecture": "x86_64",
Expand Down

0 comments on commit fa826c3

Please sign in to comment.