Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Merged
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
4 changes: 2 additions & 2 deletions cmd/frontend/internal/app/pkg/updatecheck/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ var (
// non-cluster installations what the latest version is. The version here _must_ be
// available at https://hub.docker.com/r/sourcegraph/server/tags/ before
// landing in master.
latestReleaseDockerServerImageBuild = newBuild("3.2.2")
latestReleaseDockerServerImageBuild = newBuild("3.3.0")

// latestReleaseKubernetesBuild is only used by sourcegraph.com to tell existing Sourcegraph
// cluster deployments what the latest version is. The version here _must_ be available in
// a tag at https://github.com/sourcegraph/deploy-sourcegraph before landing in master.
latestReleaseKubernetesBuild = newBuild("3.2.2")
latestReleaseKubernetesBuild = newBuild("3.3.0")
)

func getLatestRelease(deployType string) build {
Expand Down
6 changes: 3 additions & 3 deletions doc/_resources/templates/doc.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<nav id="version">
{{/* Update these after each release. */}}
{{$previousReleaseRevspec := "v3.1.2"}}
{{$previousReleaseVersion := "3.1"}}
{{$currentReleaseRevspec := "v3.2.2"}}
{{$currentReleaseVersion := "3.2"}}
{{$previousReleaseVersion := "3.2"}}
{{$currentReleaseRevspec := "v3.3.0"}}
{{$currentReleaseVersion := "3.3"}}
{{$nextReleaseVersion := "master"}}
Version:
{{if (and .ContentVersion (ne .ContentVersion $currentReleaseRevspec))}}
Expand Down
4 changes: 2 additions & 2 deletions doc/admin/external_database.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Please refer to our [Postgres](https://docs.sourcegraph.com/admin/postgres) docu
We want line breaks for readability, but backslashes to escape them do not work cross-platform.
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->
<pre class="pre-wrap"><code>docker run [...]<span class="virtual-br"></span> -e PGHOST=psql.mycompany.org<span class="virtual-br"></span> -e PGUSER=sourcegraph<span class="virtual-br"></span> -e PGPASSWORD=secret<span class="virtual-br"></span> -e PGDATABASE=sourcegraph<span class="virtual-br"></span> -e PGSSLMODE=disable<span class="virtual-br"></span> sourcegraph/server:3.2.2</code></pre>
<pre class="pre-wrap"><code>docker run [...]<span class="virtual-br"></span> -e PGHOST=psql.mycompany.org<span class="virtual-br"></span> -e PGUSER=sourcegraph<span class="virtual-br"></span> -e PGPASSWORD=secret<span class="virtual-br"></span> -e PGDATABASE=sourcegraph<span class="virtual-br"></span> -e PGSSLMODE=disable<span class="virtual-br"></span> sourcegraph/server:3.3.0</code></pre>

Most standard PostgreSQL environment variables may be specified (`PGPORT`, etc). See http://www.postgresql.org/docs/current/static/libpq-envars.html for a full list.

Expand All @@ -37,6 +37,6 @@ Simply add the `REDIS_ENDPOINT` environment variable to your `docker run` comman
We want line breaks for readability, but backslashes to escape them do not work cross-platform.
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->
<pre class="pre-wrap"><code>docker run [...]<span class="virtual-br"></span> -e REDIS_ENDPOINT=redis.mycompany.org:6379<span class="virtual-br"></span> sourcegraph/server:3.2.2</code></pre>
<pre class="pre-wrap"><code>docker run [...]<span class="virtual-br"></span> -e REDIS_ENDPOINT=redis.mycompany.org:6379<span class="virtual-br"></span> sourcegraph/server:3.3.0</code></pre>

> NOTE: On Mac/Windows, if trying to connect to a Redis server on the same host machine, remember that Sourcegraph is running inside a Docker container inside of the Docker virtual machine. You may need to specify your actual machine IP address and not `localhost` or `127.0.0.1` as that refers to the Docker VM itself.
2 changes: 1 addition & 1 deletion doc/admin/install/docker/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ If you're just starting out, we recommend [installing Sourcegraph locally](index
- usermod -a -G docker ec2-user

# Install and run Sourcegraph. Restart the container upon subsequent reboots
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7080 --publish 2633:2633 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.2.2' ]
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7080 --publish 2633:2633 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.3.0' ]
```

- Select **Next: ...** until you get to the **Configure Security Group** page, then add the default **HTTP** rule (port range "80", source "0.0.0.0/0, ::/0")
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/install/docker/digitalocean.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ If you're just starting out, we recommend [installing Sourcegraph locally](index
runcmd:
- mkdir -p /root/.sourcegraph/config
- mkdir -p /root/.sourcegraph/data
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7443 --publish 2633:2633 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.2.2' ]
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7443 --publish 2633:2633 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.3.0' ]
```

- Launch your instance, then navigate to its IP address.
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/install/docker/google_cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ If you're just starting out, we recommend [installing Sourcegraph locally](index
sudo apt-get install -y docker-ce
mkdir -p /root/.sourcegraph/config
mkdir -p /root/.sourcegraph/data
docker run -d --publish 80:7080 --publish 443:7443 --publish 2633:2633 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.2.2
docker run -d --publish 80:7080 --publish 443:7443 --publish 2633:2633 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.3.0
```

- Create your VM, then navigate to its public IP address.
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/install/docker/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ It takes less than 5 minutes to install Sourcegraph using Docker. If you've got
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->

<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 2633:2633 --rm<span class="virtual-br"></span> --volume ~/.sourcegraph/config:/etc/sourcegraph<span class="virtual-br"></span> --volume ~/.sourcegraph/data:/var/opt/sourcegraph<span class="virtual-br"></span> sourcegraph/server:3.2.2</code></pre>
<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 2633:2633 --rm<span class="virtual-br"></span> --volume ~/.sourcegraph/config:/etc/sourcegraph<span class="virtual-br"></span> --volume ~/.sourcegraph/data:/var/opt/sourcegraph<span class="virtual-br"></span> sourcegraph/server:3.3.0</code></pre>

Access the server on port `7080`, then the below screencast will show you how to configure Sourcegraph to search public and private repositories, and enable code intelligence on Sourcegraph and GitHub.com.
<p class="container">
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/management_console.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The management console is built-in to the same Docker image and published on por
```
$ docker ps
CONTAINER ID IMAGE PORTS
394ff36a8c3c sourcegraph/server:3.2.2 0.0.0.0:2633->2633/tcp, 0.0.0.0:7080->7080/tcp
394ff36a8c3c sourcegraph/server:3.3.0 0.0.0.0:2633->2633/tcp, 0.0.0.0:7080->7080/tcp
```

Usually, you can access it through the public internet via https://my.server.ip:2633, or https://localhost:2633 when testing locally.
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/postgres.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ docker run -p 7080:7080 -p 2633:2633 --rm \
-v ~/.sourcegraph/config:/etc/sourcegraph \
-v ~/.sourcegraph/data:/var/opt/sourcegraph \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
sourcegraph/server:3.2.2
sourcegraph/server:3.3.0
```

**3.** When the upgrade has been completed, stop the Sourcegraph container, then run again using the original `docker run` command (without mounting the Docker socket).
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/ssl_https_self_signed_cert_nginx.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ docker container run \
\
--volume ~/.sourcegraph/config:/etc/sourcegraph \
--volume ~/.sourcegraph/data:/var/opt/sourcegraph \
sourcegraph/server:3.2.2
sourcegraph/server:3.3.0
```

> NOTE: We recommend removing `--publish 7080:7080` as it's not needed and traffic sent to that port is un-encrypted.
Expand Down
2 changes: 1 addition & 1 deletion doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ It takes less than 5 minutes to install Sourcegraph using Docker. If you've got
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->

<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 2633:2633 --rm<span class="virtual-br"></span> --volume ~/.sourcegraph/config:/etc/sourcegraph<span class="virtual-br"></span> --volume ~/.sourcegraph/data:/var/opt/sourcegraph<span class="virtual-br"></span> sourcegraph/server:3.2.2</code></pre>
<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 2633:2633 --rm<span class="virtual-br"></span> --volume ~/.sourcegraph/config:/etc/sourcegraph<span class="virtual-br"></span> --volume ~/.sourcegraph/data:/var/opt/sourcegraph<span class="virtual-br"></span> sourcegraph/server:3.3.0</code></pre>

Access the server on port `7080`, then the below screencast will show you how to configure Sourcegraph to search public and private repositories, and enable code intelligence on Sourcegraph and GitHub.com.

Expand Down