You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/admin/deploy/docker-compose/upgrade.mdx
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,7 +8,7 @@ This document describes the process to update a Docker Compose Sourcegraph insta
8
8
9
9
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.
10
10
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.
12
12
13
13
```sh
14
14
# first, checkout the release branch
@@ -17,16 +17,16 @@ git checkout release
17
17
git fetch upstream
18
18
# merge the upstream release tag into your release branch
19
19
git checkout release
20
-
git merge v3.43.2
20
+
git merge v5.6.2535
21
21
```
22
22
23
23
#### Address any merge conflicts you might have
24
24
25
25
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.
26
26
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:
28
28
>
29
-
> `git merge -X theirs v3.43.2`
29
+
> `git merge -X theirs v5.6.2535`
30
30
>
31
31
> If you do this, make sure your configuration is correct before proceeding because it may have made changes to your docker-compose YAML file.
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
46
46
Alternatively you can create a new Docker image which inherits from Sourcegraph and then mutates the environment:
47
47
48
48
```dockerfile
49
-
FROM sourcegraph/server:5.3.9104
49
+
FROM sourcegraph/server:5.6.2535
50
50
51
51
COPY gitconfig /etc/gitconfig
52
52
COPY ssh /root/.ssh
@@ -87,7 +87,7 @@ This is required to [collect debug data](/admin/pprof).
87
87
The docker run command for single-container Sourcegraph needs an additional publish flag to expose the debug port:
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:
105
105
```sh
106
106
$ docker run [...]
107
107
-e (YOUR CODE)
108
-
sourcegraph/server:5.3.9104
108
+
sourcegraph/server:5.6.2535
109
109
```
110
110
111
111
## Operation
@@ -254,7 +254,7 @@ Sourcegraph can be **tested** on Windows 10 using roughly the same steps provide
254
254
1.[Install Docker for Windows](https://docs.docker.com/docker-for-windows/install/)
255
255
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:
0 commit comments