artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 19:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert publishing wolfi base images (#62117)

Browse Source 
* Revert build base images

* Revert 'MANUAL REBUILD' comment in image configs

* sg wolfi lock
This commit is contained in:
Will Dollman 2024-04-25 11:33:00 +01:00 committed by GitHub
parent c146d937c6
commit 0d7ab3e62e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
60 changed files with 33 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev/ci/internal/ci/pipeline.go
View File

@ -144,16 +144,13 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) {
ops.Merge(securityOps)
// Wolfi package and apko lock check
packageOps, baseImageOps, apkoOps := addWolfiOps(c)
packageOps, apkoOps := addWolfiOps(c)
if apkoOps != nil {
ops.Merge(apkoOps)
}
if packageOps != nil {
ops.Merge(packageOps)
}
if baseImageOps != nil {
ops.Merge(baseImageOps)
}
if c.Diff.Has(changed.ClientBrowserExtensions) {
ops.Merge(operations.NewNamedSet("Browser Extensions",
@ -326,16 +323,13 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) {
))
// Wolfi package and base images
packageOps, baseImageOps, apkoOps := addWolfiOps(c)
packageOps, apkoOps := addWolfiOps(c)
if apkoOps != nil {
ops.Merge(apkoOps)
}
if packageOps != nil {
ops.Merge(packageOps)
}
if baseImageOps != nil {
ops.Merge(baseImageOps)
}
// All operations before this point are required
ops.Append(wait)

10
dev/ci/internal/ci/wolfi_operations.go
View File

@ -269,7 +269,7 @@ func getPackagesFromBaseImageConfig(configFile string) ([]string, error) {
}
// addWolfiOps adds operations to rebuild modified Wolfi packages and base images.
func addWolfiOps(c Config) (packageOps, baseImageOps, apkoOps *operations.Set) {
func addWolfiOps(c Config) (packageOps, apkoOps *operations.Set) {
// Rebuild Wolfi packages that have config changes
var updatedPackages []string
if c.Diff.Has(changed.WolfiPackages) {
@ -287,16 +287,10 @@ func addWolfiOps(c Config) (packageOps, baseImageOps, apkoOps *operations.Set) {
imagesToRebuild = sortUniq(imagesToRebuild)
if len(imagesToRebuild) > 0 {
baseImageOps, _ = WolfiBaseImagesOperations(
imagesToRebuild,
c.Version,
(len(updatedPackages) > 0),
)
apkoOps = WolfiCheckApkoLocks()
}
return packageOps, baseImageOps, apkoOps
return packageOps, apkoOps
}
// wolfiBaseImageLockAndCreatePR updates base image hashes and creates a PR in GitHub

2
wolfi-images/batcheshelper.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "3ed671542726fde77a91219e7c99afb0927ad2c9bc62c9b34042e25266c3db61",
"configHash": "501d23b045ac731cdeca7c1a35ef253ba8754fc03da98cdd96c4fd1ce8583c42",
"contents": {
"keyring": [
{

2
wolfi-images/batcheshelper.yaml
View File

@ -8,5 +8,3 @@ contents:
## batcheshelper packages
- 'git'
# MANUAL REBUILD:

2
wolfi-images/blobstore.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "2aba945ea0f7c42623838e8ab49f7940df011f0fc73b17a201fab440b57562ce",
"configHash": "b954aeb9411bf8f92d4591244af9bb1ccc01f54f5581a6581d94fe1cd57c2920",
"contents": {
"keyring": [
{

2
wolfi-images/blobstore.yaml
View File

@ -17,5 +17,3 @@ paths:
permissions: 0o755
work-dir: /opt/s3proxy
# MANUAL REBUILD:

2
wolfi-images/bundled-executor.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "a32ba2be8b4dfa6e05380bd64a0bd2679ec69fdb91352dba8359e2e58c56abee",
"configHash": "0ee8a000d8935dd5e5989ac82bdf94f96d7260206b2516d693a48f77a6de6e93",
"contents": {
"keyring": [
{

1
wolfi-images/bundled-executor.yaml
View File

@ -22,4 +22,3 @@ paths:
type: directory
permissions: 0o755
# MANUAL REBUILD:

2
wolfi-images/caddy.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "e46abee367a7b01954d89ca89613f0e37637b2ea49a9f6c621a792f9b435f3e4",
"configHash": "fa1a8046df3d8d171d27915e7cb8600b1a0b21ea76133ea1e2e40318656f05db",
"contents": {
"keyring": [
{

2
wolfi-images/caddy.yaml
View File

@ -42,5 +42,3 @@ annotations:
org.opencontainers.image.title: Caddy
org.opencontainers.image.description: "a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
org.opencontainers.image.licenses: "Apache-2.0"
# MANUAL REBUILD:

2
wolfi-images/cadvisor.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "d0de158408748722b0227ea0ffadfa8042d1ce34bc1102ec4a88ab99ac55b507",
"configHash": "4bc91b632e89948aec3b44e538b7bfcba5c149aa99b52d3429cce60c7327bcf4",
"contents": {
"keyring": [
{

2
wolfi-images/cadvisor.yaml
View File

@ -8,5 +8,3 @@ contents:
## cadvisor dependencies
- cadvisor
# MANUAL REBUILD:

2
wolfi-images/cloud-mi2.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "08129e6390fc2098c7157143a11e7f1c96c8f3f019640f83ab6cc4a97f63e18d",
"configHash": "4834997e0fb9640c710c8c1a0e70125b9ec4cefebc7d3dd9788a563c420bc412",
"contents": {
"keyring": [
{

2
wolfi-images/cloud-mi2.yaml
View File

@ -23,5 +23,3 @@ contents:
# it does not support running container with non-root user.
accounts:
run-as: root
# MANUAL REBUILD:

2
wolfi-images/executor-kubernetes.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "cbca2227f18cd26d1f84c5fed767b41eebee0f8fdd6402e831edfcb14786b22a",
"configHash": "1cb8edea905b768756479bf48f64ff066dbfd58005060d8e2ed16b05d3ae6478",
"contents": {
"keyring": [
{

2
wolfi-images/executor-kubernetes.yaml
View File

@ -8,5 +8,3 @@ contents:
## executor-kubernetes packages
- git
# MANUAL REBUILD:

2
wolfi-images/executor.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "faccd68e9ed11e1de0a8a9d2d4024e08b3597580f66b7371cd8afde94ae0c1cb",
"configHash": "b970af3909e4bde636e0cc6056204ef9e1b4117c9132fa1386af4d6c445e444e",
"contents": {
"keyring": [
{

2
wolfi-images/executor.yaml
View File

@ -15,5 +15,3 @@ paths:
- path: /usr/local/bin
type: directory
permissions: 0o755
# MANUAL REBUILD:

2
wolfi-images/gitserver.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "2045ef1b52081f23b1bbb08d9bbba5d3f0e39aded17d5e99e7c300b8e6881fe8",
"configHash": "da70ef3732e18eb498f54b15ee16bf466c34ec8ac25fa28954aaa9cefd89cc30",
"contents": {
"keyring": [
{

2
wolfi-images/gitserver.yaml
View File

@ -26,5 +26,3 @@ paths:
permissions: 0o755
work-dir: /
# MANUAL REBUILD:

2
wolfi-images/grafana.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "9718b530b480918b294b0cbc0bd163d09f3783dfb3ee58ee092c3335eb7df397",
"configHash": "9ed4d915d1c5e54360e87305c3bab861102413e764f535d8b066632f7c98c195",
"contents": {
"keyring": [
{

2
wolfi-images/grafana.yaml
View File

@ -103,5 +103,3 @@ annotations:
org.opencontainers.image.url: https://sourcegraph.com/
org.opencontainers.image.source: https://github.com/sourcegraph/sourcegraph/
org.opencontainers.image.documentation: https://sourcegraph.com/docs/
# MANUAL REBUILD:

2
wolfi-images/jaeger-agent.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "59baec866309d1e1c5be076c9022b6ddabdeaa769e8716c8e69acd762f369a43",
"configHash": "3344e1ec92f0936169f62ad43d1c3f043c1fa03a3fbaea4a1f72b4d10183867f",
"contents": {
"keyring": [
{

2
wolfi-images/jaeger-agent.yaml
View File

@ -19,5 +19,3 @@ accounts:
- username: jaeger
uid: 10001
gid: 10002
# MANUAL REBUILD:

2
wolfi-images/jaeger-all-in-one.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "ba51d333a2fa640667d750c9adbcc8f89a6d72e2c73ba5246048ccc7b9bcaa18",
"configHash": "ed80b9492ce2f63681cf0493c5095e525bd777ae3cca716592bc0e1522cb631d",
"contents": {
"keyring": [
{

2
wolfi-images/jaeger-all-in-one.yaml
View File

@ -25,5 +25,3 @@ paths:
type: directory
uid: 10001
permissions: 0o755
# MANUAL REBUILD:

2
wolfi-images/node-exporter.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "4d9771b757a2a3b4f7b63d6ea59480a9c775f825a0b8c197f97ef81c238a2a5b",
"configHash": "3db6ddedd2b70859755afbdaef8e063b9eec37ccc7cf9ad3a71a48da7180422e",
"contents": {
"keyring": [
{

2
wolfi-images/node-exporter.yaml
View File

@ -4,5 +4,3 @@ contents:
packages:
## node-exporter-specific packages
- prometheus-node-exporter
# MANUAL REBUILD:

2
wolfi-images/opentelemetry-collector.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "19e7917357207bcc5f47729b2672104891fb7f68eb38b84da0cf285e2718219d",
"configHash": "23fa1caa5030ad1d2fff79dba5334206e25d0fe1fceeae007440efec4084656b",
"contents": {
"keyring": [
{

2
wolfi-images/opentelemetry-collector.yaml
View File

@ -15,5 +15,3 @@ paths:
permissions: 0o755
work-dir: /otel-collector
# MANUAL REBUILD:

2
wolfi-images/postgres-exporter.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "727d245b7e8ea1ab3a2d991476e00444b0fcf7446ef0080741edac6a8d0d0df4",
"configHash": "b9d9404b91b3c5c06fefb0580cc06146c6e89ca927028aa5fce706d400e75209",
"contents": {
"keyring": [
{

2
wolfi-images/postgres-exporter.yaml
View File

@ -18,5 +18,3 @@ accounts:
- username: postgres_exporter
uid: 20001
gid: 102
# MANUAL REBUILD:

2
wolfi-images/postgresql-12-codeinsights.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "62edfdde4133669bab09c06fc1e57a69182636d7ef7f9efc04f0920e8d1a966d",
"configHash": "4ad6479b16a324b7a21dce915b9cfef8c5ef6779403cf8e507a55e75ef49e80b",
"contents": {
"keyring": [
{

2
wolfi-images/postgresql-12-codeinsights.yaml
View File

@ -55,5 +55,3 @@ accounts:
- username: postgres
uid: 70
gid: 70
# MANUAL REBUILD:

2
wolfi-images/postgresql-12.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "dc20126b60c309593bcf099d4404f5ab7ffdc1423ac990580058224659f46052",
"configHash": "90bdb3884fecede00b8769eec14c6fd0d41e1c5bb92506c92b99e2e6f2682d26",
"contents": {
"keyring": [
{

2
wolfi-images/postgresql-12.yaml
View File

@ -58,5 +58,3 @@ paths:
uid: 999
gid: 999
permissions: 0o755
# MANUAL REBUILD:

2
wolfi-images/prometheus.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "2ff0f4dc09b864dfbb7cde5fc4173de95bd4e6dded5f83c605c191d2478f58e7",
"configHash": "097b0ad3ce30d179b4c76772a1c887c369cf7377cfc547471e36963cd5ff7a50",
"contents": {
"keyring": [
{

2
wolfi-images/prometheus.yaml
View File

@ -23,5 +23,3 @@ paths:
permissions: 0o755
work-dir: /prometheus
# MANUAL REBUILD:

2
wolfi-images/redis-exporter.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "c4860f8b024ff5c5214efc1ea275342c3d497c139fdfc82500a10739e13d70b2",
"configHash": "4af602d32f191f25a5daeb3578fdd71265fb1dbc6aa2671fe235b1870acf4a79",
"contents": {
"keyring": [
{

2
wolfi-images/redis-exporter.yaml
View File

@ -8,5 +8,3 @@ contents:
## redis_exporter packages
- redis_exporter@sourcegraph
# MANUAL REBUILD:

2
wolfi-images/redis.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "37d5f4ff4a34d555095c4d7356b984d0490e6c39f23c4f2d96f3fc963e17c292",
"configHash": "ea11b538567781bc93aec32217da4bd38990c2c7fdcffd4525fe89609587bdbf",
"contents": {
"keyring": [
{

2
wolfi-images/redis.yaml
View File

@ -31,5 +31,3 @@ work-dir: /redis-data
entrypoint:
command: redis-server
# MANUAL REBUILD:

2
wolfi-images/repo-updater.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "c5101d49d066ebf1c957e9e81465ed4421a6329708200b7c849c5ba3e00902fe",
"configHash": "24c37df9a4699fecde10d4796f9318b947885895181f4f0b385e2cb69c979f11",
"contents": {
"keyring": [
{

2
wolfi-images/repo-updater.yaml
View File

@ -8,5 +8,3 @@ contents:
## repo-updater packages
- coursier@sourcegraph
# MANUAL REBUILD:

2
wolfi-images/search-indexer.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "604eda47fcaf8b845371608a85af2ebf1a975deaf4865d130a6514f5075962ee",
"configHash": "35ef2cb8839c66575609872fde276c9182c55071128406deb4f08275d96945ef",
"contents": {
"keyring": [
{

2
wolfi-images/search-indexer.yaml
View File

@ -22,5 +22,3 @@ paths:
uid: 100
gid: 101
permissions: 0o755
# MANUAL REBUILD:

2
wolfi-images/searcher.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "2e29aeb1374167290a66847c0c313cd6b3e65ceb942000cca522430d44780fb5",
"configHash": "dc6b4a8510d621b2ace12ff83f69ef04876f149dcf160e05e64c6cdb680c2a4e",
"contents": {
"keyring": [
{

2
wolfi-images/searcher.yaml
View File

@ -18,5 +18,3 @@ paths:
uid: 100
gid: 101
permissions: 0o755
# MANUAL REBUILD:

2
wolfi-images/server.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "10234e8518d28bca515593d790452c1aa44d4ea8a31fbd850b05c0369a5af6ea",
"configHash": "d1cd03d19330eb62faf4743d680b61458f72e9d11cf525a95422e2dbbfa1bf4c",
"contents": {
"keyring": [
{

2
wolfi-images/server.yaml
View File

@ -86,5 +86,3 @@ paths:
- path: /sg_grafana_additional_dashboards
type: directory
permissions: 0o755
# MANUAL REBUILD:

2
wolfi-images/sourcegraph-base.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "b05193cc3a4f40e29d13c03eecce717c88fd570a8d0acc5ad920dff4d0ceaa31",
"configHash": "9d7eed0a4cb2859be4a618d6d3361d84100e198fb3ac996c193c161d0b98313c",
"contents": {
"keyring": [
{

2
wolfi-images/sourcegraph-base.yaml
View File

@ -39,5 +39,3 @@ paths:
uid: 100
gid: 101
permissions: 0o755
# MANUAL REBUILD:

2
wolfi-images/sourcegraph-dev.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "8e05050a7b629148d53f4e204d1d88faeed605a56c44ad4f531bfeeb890f2368",
"configHash": "5c247a2c3db7257497f7309ad4f7a6b5b96e0cc0b195bc8c7f17ffe49d0cb294",
"contents": {
"keyring": [
{

2
wolfi-images/sourcegraph-dev.yaml
View File

@ -8,5 +8,3 @@ contents:
## Dev-specific tools
- apk-tools
# MANUAL REBUILD:

2
wolfi-images/sourcegraph-template.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "1e76da86ed6603b78bea43bf58437a0b5908409ed031c05ac9de4471400115aa",
"configHash": "d6728ac5dafc7b8372e5d7874dae1e413e9299fdc78b52038bb739af7e0c3093",
"contents": {
"keyring": [
{

2
wolfi-images/sourcegraph-template.yaml
View File

@ -44,5 +44,3 @@ annotations:
org.opencontainers.image.url: https://sourcegraph.com/
org.opencontainers.image.source: https://github.com/sourcegraph/sourcegraph/
org.opencontainers.image.documentation: https://sourcegraph.com/docs/
# MANUAL REBUILD:

2
wolfi-images/symbols.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "81d25c03422c88e5a2799d62a63deb6e3d5da4eda97bcabfe44e8cd122849ee4",
"configHash": "3849e9853ac10946ff0609634e50b8b9d60b7db630c446e7964428652a09f6f6",
"contents": {
"keyring": [
{

2
wolfi-images/symbols.yaml
View File

@ -18,5 +18,3 @@ paths:
uid: 100
gid: 101
permissions: 0o755
# MANUAL REBUILD:

2
wolfi-images/syntax-highlighter.lock.json
View File

@ -1,5 +1,5 @@
{
"configHash": "e19f24b50f7a3aadc792e0c9c546bb17bba4c1b985ebf1c21f0b9832e1f6fec8",
"configHash": "ae75e81be02bef20c8ccfe29b35982cb17113f359874f61a8c36ab991e98842c",
"contents": {
"keyring": [
{

2
wolfi-images/syntax-highlighter.yaml
View File

@ -9,5 +9,3 @@ contents:
## syntax-highlighter packages
- libstdc++
- http-server-stabilizer@sourcegraph
# MANUAL REBUILD: