Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(internal) release_patch: build v5.10.2832 #1121

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

DaedalusG
Copy link
Contributor

Test plan: automated release PR, CI will perform additional checks

Chickensoupwithrice and others added 2 commits November 25, 2024 22:22
We need to use the new postgresql images

### Checklist

<!--
Kubernetes and Docker Compose MUST be kept in sync. You should not merge
a change here
without a corresponding change in the other repository, unless it truly
is specific to
this repository. If uneeded, add link or explanation of why it is not
needed here.
-->
* [x] Sister
[deploy-sourcegraph](https://github.com/sourcegraph/deploy-sourcegraph)
change:
* [x] Sister
[customer-replica](https://github.com/sourcegraph/deploy-sourcegraph-docker-customer-replica-1)
change (if necessary, for any changes affecting pure-docker or
configuration):
* [x] All images have a valid tag and SHA256 sum
### Test plan
CI
<!--
As part of SOC2/GN-104 and SOC2/GN-105 requirements, all pull requests
are REQUIRED to
provide a "test plan". A test plan is a loose explanation of what you
have done or
implemented to test this, as outlined in our Testing principles and
guidelines:

https://docs.sourcegraph.com/dev/background-information/testing_principles
  Write your test plan here after the "Test plan" header.
-->
{"version":"v5.10.2832","inputs":"server=v5.10.2832","type":"patch"}
@DaedalusG DaedalusG marked this pull request as ready for review December 12, 2024 22:52
@sourcegraph-buildkite
Copy link

  • 🟢 Internal release is ready for promotion!
  • ⚠️ Do not close/merge that pull request or delete the associated branch if you intend to promote it.

@sourcegraph-buildkite
Copy link

@DaedalusG
Copy link
Contributor Author

I manually resolved conflicts in this, we're opting to merge the internal PR into main for this release due to some changes in place that didn't make it into main on last release.

@@ -30,7 +30,7 @@ services:

codeintel-db:
container_name: codeintel-db
image: 'index.docker.io/sourcegraph/codeintel-db:5.10.0@sha256:5df73dbaf7714e7a9ccaeb1d2f9ec6a84e9f746ec2ef46296d95bb693bad8ffe'
image: 'index.docker.io/sourcegraph/codeintel-db:5.10.2832@sha256:019bb4090f2bc20218887f5fd1bcfaa122ca090460f5803e1df4f6637947cb26'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jdpleiness should we update these to be postgres-16 image? I don't recall what these db-only compose files are for.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah these should be updates as well. From the comments:

# This file contains the pgsql service definition (the primary Sourcegraph database deployment), 
# as well as the codeintel-db service definition (a separate postgres deployment). Both run postgres.
# This file is used during the sourcegraph/server -> docker-compose migration process.

@Chickensoupwithrice
Copy link
Contributor

We merged the promote branch into main so we maybe don't need this anymore?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants