Skip to content

Commit ff253fa

Browse files
committed
Fixes upgrade errors
1 parent 69448ad commit ff253fa

File tree

34 files changed

+1064
-2315
lines changed

34 files changed

+1064
-2315
lines changed

contentlayer.config.ts

Lines changed: 0 additions & 112 deletions
This file was deleted.

docs/admin/config/settings.schema.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/admin/config/site.schema.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/admin/deploy/docker-compose/upgrade.mdx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { CURRENT_VERSION_STRING } from 'src/components/PreCodeBlock'
2-
31
# Upgrade Sourcegraph on Docker Compose
42

53
This document describes the process to update a Docker Compose Sourcegraph instance. If you are unfamiliar with sourcegraph versioning or releases see our [general concepts documentation](/admin/updates/).
@@ -12,7 +10,7 @@ A [standard upgrade](/admin/updates/#upgrade-types) occurs between a Sourcegraph
1210

1311
If you've [configured Docker Compose with a release branch](/admin/deploy/docker-compose/#step-1-prepare-the-deployment-repository), please merge the upstream release tag for the next minor version into your `release` branch.
1412

15-
In the following example, the release branch is being upgraded to {CURRENT_VERSION_STRING()}.
13+
In the following example, the release branch is being upgraded to.
1614

1715
```sh
1816
# first, checkout the release branch
@@ -28,9 +26,9 @@ git merge {CURRENT_VERSION}
2826

2927
For each conflict, you need to reconcile any customizations you made with the updates from the new version. Use the information you gathered earlier from the change log and changes list to interpret the merge conflict and to ensure that it doesn't over-write your customizations. You may need to update your customizations to accommodate the new version.
3028

31-
> NOTE: If you have made no changes or only very minimal changes to your configuration, you can also ask git to always select incoming changes in the event of merge conflicts. In the following example merges will be accepted from the upstream version {CURRENT_VERSION_STRING()}:
29+
> NOTE: If you have made no changes or only very minimal changes to your configuration, you can also ask git to always select incoming changes in the event of merge conflicts. In the following example merges will be accepted from the upstream version :
3230
>
33-
> `git merge -X theirs {CURRENT_VERSION_STRING}`
31+
> `git merge -X theirs`
3432
>
3533
> If you do this, make sure your configuration is correct before proceeding because it may have made changes to your docker-compose YAML file.
3634

docs/admin/deploy/docker-single-container/aws.mdx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { CURRENT_VERSION_STRING_NO_V, CURRENT_VERSION_STRING } from 'src/components/PreCodeBlock'
2-
31
# Install single-container Sourcegraph with Docker on AWS
42

53
This tutorial shows you how to deploy [single-container Sourcegraph with Docker](/admin/deploy/docker-single-container/) to a single EC2 instance on AWS.

docs/admin/deploy/docker-single-container/digitalocean.mdx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { CURRENT_VERSION_STRING_NO_V, CURRENT_VERSION_STRING } from 'src/components/PreCodeBlock'
2-
31
# Install single-container Sourcegraph with Docker on DigitalOcean
42

53
This tutorial shows you how to deploy [single-container Sourcegraph with Docker](/admin/deploy/docker-single-container/) to a single node running on DigitalOcean.

docs/admin/deploy/docker-single-container/google_cloud.mdx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { CURRENT_VERSION_STRING_NO_V, CURRENT_VERSION_STRING } from 'src/components/PreCodeBlock'
2-
31
# Install single-container Sourcegraph with Docker on Google Cloud
42

53
This tutorial shows you how to deploy [single-container Sourcegraph with Docker](/admin/deploy/docker-single-container/) to a single node running on Google Cloud.

docs/admin/deploy/docker-single-container/index.mdx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { CURRENT_VERSION_STRING_NO_V, CURRENT_VERSION_STRING } from 'src/components/PreCodeBlock'
2-
31
# Docker Single Container Deployment
42

53
The Docker Single Container deployment type is a way to very quickly get an instance of Sourcegraph set up locally to experiment with many of its features. However, it is **not recommended** for a production instance, and **has limitations** depending on the OS you are deploying to, as well as the associated resources. See the [troubleshooting section](#troubleshooting) for additional information.
@@ -296,7 +294,7 @@ Sourcegraph can be **tested** on Windows 10 using roughly the same steps provide
296294
1. [Install Docker for Windows](https://docs.docker.com/docker-for-windows/install/)
297295
2. Using a command prompt, follow the same [installation steps provided above](#install-sourcegraph-with-docker) but remove the `--volume` arguments. For example by pasting this:
298296

299-
<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm<span class="virtual-br"></span> sourcegraph/server:{CURRENT_VERSION_STRING_NO_V()}</code></pre>
297+
<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm<span class="virtual-br"></span> sourcegraph/server</code></pre>
300298

301299
### Low resource environments
302300

docs/admin/deploy/kubernetes/index.mdx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { CURRENT_VERSION_STRING_NO_V, CURRENT_VERSION_STRING } from 'src/components/PreCodeBlock'
2-
31
# Sourcegraph on Kubernetes with Helm
42

53
Best for large enterprises that require a multi-node, self-hosted solution.

docs/admin/deploy/machine-images/gce.mdx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { CURRENT_VERSION_STRING_NO_V, CURRENT_VERSION_STRING } from 'src/components/PreCodeBlock'
2-
31
# Sourcegraph Google Compute Instances
42

53
Sourcegraph [Google Compute Engine (GCE) Images](https://cloud.google.com/compute/docs/images) allow you to quickly deploy a production-ready Sourcegraph instance tuned to your organization's scale in just a few clicks.

0 commit comments

Comments
 (0)