Skip to content

Commit a08c2c7

Browse files
authored
Find and replace the current version of Sourcegraph with the old entries (#651)
- https://sourcegraph.slack.com/archives/C01DXLN3D0T/p1725413595941599
1 parent 12b29f1 commit a08c2c7

File tree

20 files changed

+42
-41
lines changed

20 files changed

+42
-41
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ set -euxo pipefail
6868
###############################################################################
6969
# Please read the notes below the script if you are cloning a private repository
7070
DEPLOY_SOURCEGRAPH_DOCKER_FORK_CLONE_URL='https://github.com/sourcegraph/deploy-sourcegraph-docker.git'
71-
DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.3.9104'
71+
DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.6.2535'
7272
##################### NO CHANGES REQUIRED BELOW THIS LINE #####################
7373
DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT='/home/ec2-user/deploy-sourcegraph-docker'
7474
DOCKER_COMPOSE_VERSION='1.29.2'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ set -euxo pipefail
7777
###############################################################################
7878
# Please read the notes below the script if you are cloning a private repository
7979
DEPLOY_SOURCEGRAPH_DOCKER_FORK_CLONE_URL='https://github.com/sourcegraph/deploy-sourcegraph-docker.git'
80-
DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.3.9104'
80+
DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.6.2535'
8181
##################### NO CHANGES REQUIRED BELOW THIS LINE #####################
8282
DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT='/root/deploy-sourcegraph-docker'
8383
DOCKER_COMPOSE_VERSION='1.29.2'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ set -euxo pipefail
5656
###############################################################################
5757
# Please read the notes below the script if you are cloning a private repository
5858
DEPLOY_SOURCEGRAPH_DOCKER_FORK_CLONE_URL='https://github.com/sourcegraph/deploy-sourcegraph-docker.git'
59-
DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.3.9104'
59+
DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.6.2535'
6060
##################### NO CHANGES REQUIRED BELOW THIS LINE #####################
6161
DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT='/root/deploy-sourcegraph-docker'
6262
DOCKER_DATA_ROOT='/mnt/docker-data'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ set -euxo pipefail
5454
###############################################################################
5555
# Please read the notes below the script if you are cloning a private repository
5656
DEPLOY_SOURCEGRAPH_DOCKER_FORK_CLONE_URL='https://github.com/sourcegraph/deploy-sourcegraph-docker.git'
57-
DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.3.9104'
57+
DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.6.2535'
5858
##################### NO CHANGES REQUIRED BELOW THIS LINE #####################
5959
# IMPORTANT: DO NOT MAKE ANY CHANGES FROM THIS POINT ONWARD
6060
DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT='/root/deploy-sourcegraph-docker'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Continue with the following steps *after* you have created a public or private c
117117

118118
```bash
119119
# Specify the version you want to install
120-
export SOURCEGRAPH_VERSION="v5.3.9104"
120+
export SOURCEGRAPH_VERSION="v5.6.2535"
121121
# Check out the selected version for use, in a new branch called "release"
122122
git checkout $SOURCEGRAPH_VERSION -b release
123123
```

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This document describes the process to update a Docker Compose Sourcegraph insta
88

99
A [standard upgrade](/admin/updates/#upgrade-types) occurs between a Sourcegraph version and the minor or major version released immediately after it. If you would like to jump forward several versions, you must perform a [multi-version upgrade](#multi-version-upgrades) instead.
1010

11-
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. In the following example, the release branch is being upgraded to v3.43.2.
11+
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. In the following example, the release branch is being upgraded to v5.6.2535.
1212

1313
```sh
1414
# first, checkout the release branch
@@ -17,16 +17,16 @@ git checkout release
1717
git fetch upstream
1818
# merge the upstream release tag into your release branch
1919
git checkout release
20-
git merge v3.43.2
20+
git merge v5.6.2535
2121
```
2222

2323
#### Address any merge conflicts you might have
2424

2525
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.
2626

27-
> 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 v3.43.2:
27+
> 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 v5.6.2535:
2828
>
29-
> `git merge -X theirs v3.43.2`
29+
> `git merge -X theirs v5.6.2535`
3030
>
3131
> If you do this, make sure your configuration is correct before proceeding because it may have made changes to your docker-compose YAML file.
3232

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This tutorial shows you how to deploy [single-container Sourcegraph with Docker]
3333
- usermod -a -G docker ec2-user
3434
3535
# Install and run Sourcegraph. Restart the container upon subsequent reboots
36-
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7080 --publish 127.0.0.1:3370:3370 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.3.9104' ]
36+
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7080 --publish 127.0.0.1:3370:3370 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.6.2535' ]
3737
```
3838

3939
- Select **Next: ...** until you get to the **Configure Security Group** page. Then add the following rules:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This tutorial shows you how to deploy [single-container Sourcegraph with Docker]
1717
1. Run the Sourcegraph Docker image as a daemon:
1818

1919
```
20-
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.3.9104
20+
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.6.2535
2121
```
2222
1. Navigate to the droplet's IP address to finish initializing Sourcegraph. If you have configured a
2323
DNS entry for the IP, configure `externalURL` to reflect that.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This tutorial shows you how to deploy [single-container Sourcegraph with Docker]
2323
sudo apt-get install -y docker-ce
2424
mkdir -p /root/.sourcegraph/config
2525
mkdir -p /root/.sourcegraph/data
26-
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.3.9104
26+
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.6.2535
2727
```
2828

2929
- Create your VM, then navigate to its public IP address.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ docker run
1313
--publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm
1414
--volume ~/.sourcegraph/config:/etc/sourcegraph
1515
--volume ~/.sourcegraph/data:/var/opt/sourcegraph
16-
sourcegraph/server:5.3.9104
16+
sourcegraph/server:5.6.2535
1717
```
1818

1919
Once the server is ready (logo is displayed in the terminal), navigate to the hostname or IP address on port `7080`. Create the admin account, then you'll be guided through setting up Sourcegraph for code searching and navigation.
@@ -46,7 +46,7 @@ For example, to mount a `.gitconfig`, create a file `/mnt/sourcegraph/config/git
4646
Alternatively you can create a new Docker image which inherits from Sourcegraph and then mutates the environment:
4747

4848
```dockerfile
49-
FROM sourcegraph/server:5.3.9104
49+
FROM sourcegraph/server:5.6.2535
5050

5151
COPY gitconfig /etc/gitconfig
5252
COPY ssh /root/.ssh
@@ -87,7 +87,7 @@ This is required to [collect debug data](/admin/pprof).
8787
The docker run command for single-container Sourcegraph needs an additional publish flag to expose the debug port:
8888

8989
```sh
90-
$ docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --publish 127.0.0.1:6060:6060 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.3.9104
90+
$ docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --publish 127.0.0.1:6060:6060 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.6.2535
9191
```
9292

9393
If Sourcegraph is deployed to a remote server, then access via an SSH tunnel using a tool
@@ -105,7 +105,7 @@ Add the following to your docker run command:
105105
```sh
106106
$ docker run [...]
107107
-e (YOUR CODE)
108-
sourcegraph/server:5.3.9104
108+
sourcegraph/server:5.6.2535
109109
```
110110

111111
## Operation
@@ -254,7 +254,7 @@ Sourcegraph can be **tested** on Windows 10 using roughly the same steps provide
254254
1. [Install Docker for Windows](https://docs.docker.com/docker-for-windows/install/)
255255
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:
256256

257-
<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:5.3.9104</code></pre>
257+
<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:5.6.2535</code></pre>
258258

259259
### Low resource environments
260260

0 commit comments

Comments
 (0)