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

Commit fa826c3

Browse files
authored
Bump openjdk-11 version in blobstore image (#64047)
<!-- 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 -->
1 parent a88bc4d commit fa826c3

File tree

1 file changed

+28
-47
lines changed

1 file changed

+28
-47
lines changed

wolfi-images/blobstore.lock.json

Lines changed: 28 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -848,25 +848,6 @@
848848
"url": "https://packages.wolfi.dev/os/x86_64/libfontconfig1-2.15.0-r1.apk",
849849
"version": "2.15.0-r1"
850850
},
851-
{
852-
"architecture": "x86_64",
853-
"checksum": "Q1AbMOLCk6tZeAxTVVT18Hjuq9ICA=",
854-
"control": {
855-
"checksum": "sha1-AbMOLCk6tZeAxTVVT18Hjuq9ICA=",
856-
"range": "bytes=706-1263"
857-
},
858-
"data": {
859-
"checksum": "sha256-8hX1Coe+PgFhWcoKnU2gKloQIVpRYCCurkVuhkqEjSI=",
860-
"range": "bytes=1264-203887"
861-
},
862-
"name": "fontconfig",
863-
"signature": {
864-
"checksum": "sha1-L+pYcv0XxYFNaL8CDwz7N4QdHjg=",
865-
"range": "bytes=0-705"
866-
},
867-
"url": "https://packages.wolfi.dev/os/x86_64/fontconfig-2.15.0-r1.apk",
868-
"version": "2.15.0-r1"
869-
},
870851
{
871852
"architecture": "x86_64",
872853
"checksum": "Q1Y8qzLT9CwROUfB6S/+OCSabT9X0=",
@@ -1038,25 +1019,6 @@
10381019
"url": "https://packages.wolfi.dev/os/x86_64/openjdk-11-jre-11.0.24-r0.apk",
10391020
"version": "11.0.24-r0"
10401021
},
1041-
{
1042-
"architecture": "x86_64",
1043-
"checksum": "Q1ntwd0U1+FDplQrJgf02kehE4jzA=",
1044-
"control": {
1045-
"checksum": "sha1-ntwd0U1+FDplQrJgf02kehE4jzA=",
1046-
"range": "bytes=661-1037"
1047-
},
1048-
"data": {
1049-
"checksum": "sha256-xW9D/0ZRSG6Q6ibItUSX/09Sf5z8dYPrmJaCaiv+/so=",
1050-
"range": "bytes=1038-619411"
1051-
},
1052-
"name": "openjdk-11",
1053-
"signature": {
1054-
"checksum": "sha1-GvP0A1icdBQ034IwFh2R0cB6ILw=",
1055-
"range": "bytes=0-660"
1056-
},
1057-
"url": "https://packages.wolfi.dev/os/x86_64/openjdk-11-11.0.20.4-r0.apk",
1058-
"version": "11.0.20.4-r0"
1059-
},
10601022
{
10611023
"architecture": "x86_64",
10621024
"checksum": "Q1U4lQ/1tfu0YohyxOxbBErxbpaio=",
@@ -1078,22 +1040,41 @@
10781040
},
10791041
{
10801042
"architecture": "x86_64",
1081-
"checksum": "Q1UmIT03dVv5Dghsv5v0ZCvsloxGI=",
1043+
"checksum": "Q1gihecR67KvYZn0Pk85WmxLYwtE0=",
10821044
"control": {
1083-
"checksum": "sha1-UmIT03dVv5Dghsv5v0ZCvsloxGI=",
1084-
"range": "bytes=657-999"
1045+
"checksum": "sha1-gihecR67KvYZn0Pk85WmxLYwtE0=",
1046+
"range": "bytes=700-1053"
10851047
},
10861048
"data": {
1087-
"checksum": "sha256-uEPvYq1n0/JMDIciXRXjReRD27P/ShP19msWn7yZO64=",
1088-
"range": "bytes=1000-48363395"
1049+
"checksum": "sha256-+OBti1i0Yk/MjPofKdDYC5TkAJ+aPOeheDIYvozVKsc=",
1050+
"range": "bytes=1054-590045"
1051+
},
1052+
"name": "openjdk-11",
1053+
"signature": {
1054+
"checksum": "sha1-O45lVwmg94/QxlIKrwXyX+dcGWY=",
1055+
"range": "bytes=0-699"
1056+
},
1057+
"url": "https://packages.wolfi.dev/os/x86_64/openjdk-11-11.0.24-r0.apk",
1058+
"version": "11.0.24-r0"
1059+
},
1060+
{
1061+
"architecture": "x86_64",
1062+
"checksum": "Q1QNqE8jUgFWO1zrxzErRr2lAgnIA=",
1063+
"control": {
1064+
"checksum": "sha1-QNqE8jUgFWO1zrxzErRr2lAgnIA=",
1065+
"range": "bytes=661-993"
1066+
},
1067+
"data": {
1068+
"checksum": "sha256-P9lwloTDYWriwF9KhB4C+eoXjONtzXNM+v/TPb8n8sc=",
1069+
"range": "bytes=994-48363450"
10891070
},
10901071
"name": "s3proxy",
10911072
"signature": {
1092-
"checksum": "sha1-8sB0XCL8VM9V50sHFyVk1cgwZ+Y=",
1093-
"range": "bytes=0-656"
1073+
"checksum": "sha1-LC8HymAKsNQOA23tzIJQqobn+9w=",
1074+
"range": "bytes=0-660"
10941075
},
1095-
"url": "https://packages.sgdev.org/main/x86_64/s3proxy-2.0.0-r5.apk",
1096-
"version": "2.0.0-r5"
1076+
"url": "https://packages.sgdev.org/main/x86_64/s3proxy-2.0.0-r6.apk",
1077+
"version": "2.0.0-r6"
10971078
},
10981079
{
10991080
"architecture": "x86_64",

0 commit comments

Comments
 (0)