Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

### Checklist

* [ ] All images have a valid tag and SHA256 sum
- [ ] All images have a valid tag and SHA256 sum

### Test plan

<!--
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.
implemented to test this. Write your test plan here after the "Test plan" header.
-->
2 changes: 1 addition & 1 deletion codeinsights-db/conf/postgresql.conf
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ max_locks_per_transaction = 64
#------------------------------------------------------------------------------

# Add your customization here
# Learn more: https://docs.sourcegraph.com/admin/config/postgres-conf
# Learn more: https://sourcegraph.com/docs/self-hosted/postgres-conf
2 changes: 1 addition & 1 deletion codeintel-db/conf/postgresql.conf
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ effective_cache_size = 3GB
#------------------------------------------------------------------------------

# Add your customization here
# Learn more: https://docs.sourcegraph.com/admin/config/postgres-conf
# Learn more: https://sourcegraph.com/docs/self-hosted/postgres-conf
2 changes: 1 addition & 1 deletion docker-compose/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This directory contains the Sourcegraph with Docker Compose deployment reference.

To learn more about deploying, configuring, and upgrading a Sourcegraph with Docker Compose installation, please refer to our documentation: [Sourcegraph with Docker Compose](https://docs.sourcegraph.com/admin/install/docker-compose)
To learn more about deploying, configuring, and upgrading a Sourcegraph with Docker Compose installation, please refer to our documentation: [Sourcegraph with Docker Compose](https://sourcegraph.com/docs/self-hosted/deploy/docker-compose)

## Shared object storage

Expand Down
2 changes: 1 addition & 1 deletion docker-compose/dev/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Development overlay

For use developing Sourcegraph's docker-compose deployment only.
For deployments, refer to the official [Sourcegraph with Docker Compose](https://docs.sourcegraph.com/admin/install/docker-compose) documentation.
For deployments, refer to the official [Sourcegraph with Docker Compose](https://sourcegraph.com/docs/self-hosted/deploy/docker-compose) documentation.

This folder includes a helper script, [run.sh](./run.sh), that will run the `docker-compose` command (with any provided arguments) while automatically specifying the appropriate set of overlays.

Expand Down
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
- CODEINTEL_PGSSLMODE=disable

# If you are not running code insights, please see:
# https://docs.sourcegraph.com/admin/install/docker-compose/operations#database-migrations for more information
# https://sourcegraph.com/docs/self-hosted/deploy/docker-compose/operations#database-migrations for more information
# for information on how to configure Sourcegraph migrations
- CODEINSIGHTS_PGHOST=codeinsights-db
- CODEINSIGHTS_PGPORT=5432
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Docker Compose override file for customers using AWS IAM authentication to databases on RDS
# See https://sourcegraph.com/docs/admin/external_services/postgres#usage-with-aws-rds-iam-auth
# See https://sourcegraph.com/docs/self-hosted/external-services/postgres#usage-with-aws-rds-iam-auth



Expand Down Expand Up @@ -79,7 +79,7 @@ services:
# command: ["add-log", "-db=codeinsights", "-version=1675347548"]

# If you do fall a few versions behind, here's the command to run a multi-version upgrade
# See https://sourcegraph.com/docs/admin/deploy/docker-compose/upgrade#multi-version-upgrades
# See https://sourcegraph.com/docs/self-hosted/deploy/docker-compose/upgrade#multi-version-upgrades
# command: ["upgrade", "--from=v6.4.0", "--to=v6.9.1277"]

# Do not skip the drift check, or use other args, without instruction from Sourcegraph Customer Support Engineering
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:

################################################################################
# Multi-version upgrades
# See https://sourcegraph.com/docs/admin/deploy/docker-compose/upgrade#multi-version-upgrades
# See https://sourcegraph.com/docs/self-hosted/deploy/docker-compose/upgrade#multi-version-upgrades
# command: ["upgrade", "--from=v6.4.0", "--to=v6.9.1277"]

# Do not skip the drift check, or use other args, without instruction from Sourcegraph Customer Support Engineering
Expand Down
2 changes: 1 addition & 1 deletion otel-collector/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exporters:
# Add your exporter(s) configuration here. For each exporter, make sure it is enabled
# in the service configuration below.
# Refer to our OpenTelemetry docs for information on how to configure different exporters:
# https://docs.sourcegraph.com/admin/observability/opentelemetry
# https://sourcegraph.com/docs/self-hosted/observability/opentelemetry

extensions:
health_check:
Expand Down
2 changes: 1 addition & 1 deletion pgsql/conf/postgresql.conf
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ effective_cache_size = 3GB
#------------------------------------------------------------------------------

# Add your customization here
# Learn more: https://docs.sourcegraph.com/admin/config/postgres-conf
# Learn more: https://sourcegraph.com/docs/self-hosted/postgres-conf
Loading