marcleblanc2 · Oct 14, 2026 · Oct 14, 2026 · Oct 14, 2026 · Oct 15, 2026 · Oct 15, 2026
diff --git a/.buildkite/ci-checkov.sh b/.buildkite/ci-checkov.sh
diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
@@ -1,6 +1,6 @@
 $schema: "http://json.schemastore.org/buildkite"
 env:
-  # Build this image in sourcegraph/infrastructure by running `make e2e` in `gcp/images`
+  # GCP VM image for the Vagrant smoke test. Build it in sourcegraph/infrastructure by running `make e2e` in `gcp/images`
   IMAGE: "e2e-db8a40720-2024-08-26t08-44-10z"
   VAGRANT_RUN_ENV: "CI"
 steps:
@@ -19,17 +19,8 @@ steps:
   - label: ":rice: docker-compose-test"
     command: .buildkite/vagrant-run.sh docker-test
     artifact_paths: ./*.log
-    env:
-      TEST_TYPE: "docker-compose-test"
     agents: { queue: "vagrant" }
 
-  # This runs the Checkov Terraform Code scanner
-  # https://www.checkov.io/
-  - command: .buildkite/ci-checkov.sh
-    label: ":lock: security - checkov"
-    agents: { queue: "standard" }
-    soft_fail: true
-
   # Please keep in mind that the release manifest uses specific branch names when creating releases.
   # Therefore, if you update them, or if you decide to change how we detect what kind of build we're dealing
   # with, please update this file as well.

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -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.
 -->
diff --git a/.gitignore b/.gitignore
@@ -2,11 +2,6 @@
 
 node_modules/
 
-nginx/sourcegraph.crt
-nginx/sourcegraph.key
-
 .vagrant
 *.log
 /.env
-
-/right.dhall
diff --git a/.nvmrc b/.nvmrc
diff --git a/.tool-versions b/.tool-versions
@@ -1,6 +1,4 @@
 nodejs                   16.7.0
 yarn                     1.22.4
-shellcheck               0.7.1
 golang                   1.19.8
 github-cli               2.46.0
-asdf:bosmak/asdf-checkov latest
diff --git a/README.md b/README.md
@@ -1,36 +1,15 @@
-# Sourcegraph with Docker Compose
+# Deploy Sourcegraph via Docker Compose
 
 [![sourcegraph: search](https://img.shields.io/badge/sourcegraph-search-brightgreen.svg)](https://sourcegraph.com/github.com/sourcegraph/deploy-sourcegraph-docker) [![Build status](https://badge.buildkite.com/e60f9ffcafd68882d3db6fe5e33567e3a111d391a554d50d82.svg)](https://buildkite.com/sourcegraph/deploy-sourcegraph-docker)
 
-This repository is the deployment reference for [deploying Sourcegraph with Docker Compose](https://docs.sourcegraph.com/admin/install/docker-compose).
+This repository is the deployment reference for [deploying Sourcegraph with Docker Compose](https://sourcegraph.com/docs/self-hosted/deploy/docker-compose).
 
-> 🚨 IMPORTANT: When upgrading Sourcegraph, please check [upgrading docs](https://docs.sourcegraph.com/admin/updates/docker_compose) to check if any manual migrations are necessary.
->
-> The `main` branch tracks development. Use the branch of this repository corresponding to the
-> version of Sourcegraph you wish to deploy, e.g. `git checkout 3.19`.
-
-For product and [pricing](https://about.sourcegraph.com/pricing/) information, visit
-[about.sourcegraph.com](https://about.sourcegraph.com) or [contact
-us](https://about.sourcegraph.com/contact/sales) for more information. If you're just starting out,
-we recommend running Sourcegraph as a [single Docker
-container](https://docs.sourcegraph.com/#quickstart-guide) or using [Docker
-Compose](https://docs.sourcegraph.com/admin/install/docker-compose). Migrating to Sourcegraph on
-Kubernetes is easy later.
+🚨 IMPORTANT: When upgrading Sourcegraph, please check the [upgrade docs](https://sourcegraph.com/docs/self-hosted/deploy/docker-compose/upgrade) and [changelog](https://sourcegraph.com/changelog/self-hosted/docker-compose), then use the tag matching the Sourcegraph version, e.g. `git checkout v8.1.0`
 
 ## Is Docker Compose the right deployment type for me?
 
-Please see [our docs](https://docs.sourcegraph.com/admin/install) for comparisons of deployment types and our resource estimator.
-
-## Contributing
-
-We've made our deployment configurations open source to better serve our customers' needs. If there is anything we can do to make deploying Sourcegraph easier just [open an issue (in sourcegraph/sourcegraph)](https://github.com/sourcegraph/sourcegraph/issues/new?assignees=&labels=deploy-sourcegraph-docker&title=%5Bdeploy-sourcegraph-docker%5D) or a pull request and we will respond promptly!
-
-## Questions & Issues
-
-[Open an issue (in sourcegraph/sourcegraph)](https://github.com/sourcegraph/sourcegraph/issues/new?assignees=&labels=deploy-sourcegraph&template=deploy-sourcegraph.md&title=%5Bdeploy-sourcegraph%5D) or contact us (support@sourcegraph.com), we are happy to help!
-
-### Contributing 
+Please see [our docs](https://sourcegraph.com/docs/self-hosted/deploy) for comparisons of our deployment types
 
-#### Releasing 
+## Support
 
-Please see the [documentation](https://go/releases).
+Please contact us at support@sourcegraph.com
diff --git a/TESTING.md b/TESTING.md
diff --git a/codeinsights-db/conf/postgresql.conf b/codeinsights-db/conf/postgresql.conf
@@ -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
diff --git a/codeintel-db/conf/postgresql.conf b/codeintel-db/conf/postgresql.conf
@@ -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
diff --git a/docker-compose/README.md b/docker-compose/README.md
@@ -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
 

diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml
@@ -1,6 +1,7 @@
 # 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.
+# This file is used for database-only operations such as backup and restore.
+# See https://sourcegraph.com/docs/self-hosted/deploy/docker-compose/operations
 #
 # 🚨This file MUST be kept in sync with the pgsql definition in docker-compose/docker-compose.yaml
 version: '2.4'

diff --git a/docker-compose/dev/README.md b/docker-compose/dev/README.md
@@ -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.
 

diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
@@ -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

diff --git a/docker-compose/examples/aws-rds-databases/docker-compose.override.yaml b/docker-compose/examples/aws-rds-databases/docker-compose.override.yaml
@@ -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
 
 
 
@@ -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

diff --git a/docker-compose/examples/migrator-operations/docker-compose.override.yaml b/docker-compose/examples/migrator-operations/docker-compose.override.yaml
@@ -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

diff --git a/go.mod b/go.mod
@@ -5,22 +5,18 @@ go 1.19
 require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/sourcegraph/run v0.12.0
-	github.com/sourcegraph/sourcegraph/dev/ci/images v0.0.0-20240222005846-e3158c0c2717
-	github.com/sourcegraph/update-docker-tags v0.10.0
 	github.com/urfave/cli/v2 v2.25.7
 )
 
 require (
 	bitbucket.org/creachadair/shell v0.0.7 // indirect
-	github.com/Masterminds/semver/v3 v3.1.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/djherbis/buffer v1.2.0 // indirect
 	github.com/djherbis/nio/v3 v3.0.1 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/itchyny/gojq v0.12.11 // indirect
 	github.com/itchyny/timefmt-go v0.1.5 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect

diff --git a/go.sum b/go.sum
@@ -2,8 +2,6 @@ bitbucket.org/creachadair/shell v0.0.7 h1:Z96pB6DkSb7F3Y3BBnJeOZH2gazyMTWlvecSD4
 bitbucket.org/creachadair/shell v0.0.7/go.mod h1:oqtXSSvSYr4624lnnabXHaBsYW6RD80caLi2b3hJk0U=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
-github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk=
-github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -37,21 +35,13 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/nightlyone/lockfile v1.0.0 h1:RHep2cFKK4PonZJDdEl4GmkabuhbsRMgk/k3uAmxBiA=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sourcegraph/run v0.12.0 h1:3A8w5e8HIYPfafHekvmdmmh42RHKGVhmiTZAPJclg7I=
 github.com/sourcegraph/run v0.12.0/go.mod h1:PwaP936BTnAJC1cqR5rSbG5kOs/EWStTK3lqvMX5GUA=
-github.com/sourcegraph/sourcegraph/dev/ci/images v0.0.0-20231101211343-d046aeda10e4 h1:Mi4SkXsHkJBGrzbrarAU0gCT/GpwP4OnAVrqynAUjoQ=
-github.com/sourcegraph/sourcegraph/dev/ci/images v0.0.0-20231101211343-d046aeda10e4/go.mod h1:HpOGaRM0iHPNrEQvpB4/3E9dAUjutyhgjg9vrOOeXPY=
-github.com/sourcegraph/sourcegraph/dev/ci/images v0.0.0-20240222005846-e3158c0c2717 h1:xzO3kAjylr2urK0w5Yu95n98jSwpTQ4w/rvf8QA5pwY=
-github.com/sourcegraph/sourcegraph/dev/ci/images v0.0.0-20240222005846-e3158c0c2717/go.mod h1:HpOGaRM0iHPNrEQvpB4/3E9dAUjutyhgjg9vrOOeXPY=
-github.com/sourcegraph/update-docker-tags v0.10.0 h1:KpY1HtvSt0FzDM/sR0jQF5StNbiPKpqmHhE0jpBEa0A=
-github.com/sourcegraph/update-docker-tags v0.10.0/go.mod h1:lCDsoUnk/ASDbm7UxE7tU3qAUhQxA7xykELHXcLeKFM=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
 github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
diff --git a/nginx/nginx/sourcegraph_backend.conf b/nginx/nginx/sourcegraph_backend.conf