Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

Commit

Permalink
release: sourcegraph@3.24.0 (#17477)
Browse files Browse the repository at this point in the history
* draft sourcegraph@3.24.0 release

* docs upgrade to 3.24
  • Loading branch information
davejrt authored and Dave Try committed Jan 20, 2021
1 parent 74903f9 commit c416856
Show file tree
Hide file tree
Showing 18 changed files with 34 additions and 20 deletions.
6 changes: 3 additions & 3 deletions cmd/frontend/internal/app/updatecheck/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ var (
// non-cluster, non-docker-compose, and non-pure-docker 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.23.0")
latestReleaseDockerServerImageBuild = newBuild("3.24.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.23.0")
latestReleaseKubernetesBuild = newBuild("3.24.0")

// latestReleaseDockerComposeOrPureDocker is only used by sourcegraph.com to tell existing Sourcegraph
// Docker Compose or Pure Docker deployments what the latest version is. The version here _must_ be
// available in a tag at https://github.com/sourcegraph/deploy-sourcegraph-docker before landing in master.
latestReleaseDockerComposeOrPureDocker = newBuild("3.23.0")
latestReleaseDockerComposeOrPureDocker = newBuild("3.24.0")
)

func getLatestRelease(deployType string) build {
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/external_services/postgres.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Add the following to your `docker run` command:
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->

<pre class="pre-wrap start-sourcegraph-command"><code>docker run [...]<span class="virtual-br"></span> -e PGHOST=psql1.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=require<span class="virtual-br"> -e CODEINTEL_PGHOST=psql2.mycompany.org<span class="virtual-br"></span> -e CODEINTEL_PGUSER=sourcegraph<span class="virtual-br"></span> -e CODEINTEL_PGPASSWORD=secret<span class="virtual-br"></span> -e CODEINTEL_PGDATABASE=sourcegraph-codeintel<span class="virtual-br"></span> -e CODEINTEL_PGSSLMODE=require<span class="virtual-br"></span> sourcegraph/server:3.23.0</code></pre>
<pre class="pre-wrap start-sourcegraph-command"><code>docker run [...]<span class="virtual-br"></span> -e PGHOST=psql1.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=require<span class="virtual-br"> -e CODEINTEL_PGHOST=psql2.mycompany.org<span class="virtual-br"></span> -e CODEINTEL_PGUSER=sourcegraph<span class="virtual-br"></span> -e CODEINTEL_PGPASSWORD=secret<span class="virtual-br"></span> -e CODEINTEL_PGDATABASE=sourcegraph-codeintel<span class="virtual-br"></span> -e CODEINTEL_PGSSLMODE=require<span class="virtual-br"></span> sourcegraph/server:3.24.0</code></pre>

### Docker Compose

Expand Down
2 changes: 1 addition & 1 deletion doc/admin/external_services/redis.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ or follow the [IANA specification for Redis URLs](https://www.iana.org/assignmen
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.23.0</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.24.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.
Expand Down
4 changes: 2 additions & 2 deletions doc/admin/install/docker-compose/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 run and install Sourcegraph using Docker Compose
```bash
git clone https://github.com/sourcegraph/deploy-sourcegraph-docker
cd deploy-sourcegraph-docker/docker-compose
SOURCEGRAPH_VERSION="v3.23.0"
SOURCEGRAPH_VERSION="v3.24.0"
git checkout $SOURCEGRAPH_VERSION
docker-compose up -d
```
Expand All @@ -35,7 +35,7 @@ We **strongly** recommend that you create your own fork of [sourcegraph/deploy-s
* Create a `release` branch (to track all of your customizations to Sourcegraph. When you upgrade Sourcegraph's Docker Compose definition, you will merge upstream into this branch.

```bash
SOURCEGRAPH_VERSION="v3.23.0"
SOURCEGRAPH_VERSION="v3.24.0"
git checkout $SOURCEGRAPH_VERSION -b release
```

Expand Down
2 changes: 1 addition & 1 deletion doc/admin/install/docker/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This tutorial shows you how to deploy Sourcegraph to a single EC2 instance on AW
- 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 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:3.23.0' ]
- [ 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:3.24.0' ]
```

- Select **Next: ...** until you get to the **Configure Security Group** page. Then add the following rules:
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 @@ -16,7 +16,7 @@ This tutorial shows you how to deploy Sourcegraph to a single node running on Di
1. Run the Sourcegraph Docker image as a daemon:

```
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:3.23.0
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:3.24.0
```
1. Navigate to the droplet's IP address to finish initializing Sourcegraph. If you have configured a
DNS entry for the IP, configure `externalURL` to reflect that.
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 @@ This tutorial shows you how to deploy Sourcegraph to a single node running on Go
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 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.23.0
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:3.24.0
```

- Create your VM, then navigate to its public IP address.
Expand Down
4 changes: 2 additions & 2 deletions doc/admin/install/docker/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ It takes less than a minute to run and install Sourcegraph using Docker:
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->

<pre class="pre-wrap start-sourcegraph-command"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --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.23.0</code></pre>
<pre class="pre-wrap start-sourcegraph-command"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --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.24.0</code></pre>

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.

Expand Down Expand Up @@ -56,7 +56,7 @@ Sourcegraph can be **tested** on Windows 10 using roughly the same steps provide
1. [Install Docker for Windows](https://docs.docker.com/docker-for-windows/install/)
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:

<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:3.23.0</code></pre>
<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:3.24.0</code></pre>

## Low resource environments

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.23.0
sourcegraph/server:3.24.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/pprof.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ kubectl port-forward sourcegraph-frontend-xxxx 6060:6060
The docker run command for the single-container server needs an additional publish flag to expose the debug port:

```bash script
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:3.23.0
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:3.24.0
```

If Sourcegraph is deployed to a remote server, then access via an SSH tunnel using a tool
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/repo/custom_git_or_ssh_config.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ For cluster environments, we have guides for configuring SSH cloning. These can
Upon the Sourcegraph Docker image container start, it copies all files from `/etc/sourcegraph/{ssh,gitconfig,netrc}` into its own `$HOME` directory. Alternatively you can create a new Docker image which inherits from Sourcegraph and then mutates the environment:

``` dockerfile
FROM sourcegraph/server:3.23.0
FROM sourcegraph/server:3.24.0

COPY gitconfig /etc/gitconfig
COPY ssh /root/.ssh
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 @@ -91,7 +91,7 @@ docker container run \
\
--volume ~/.sourcegraph/config:/etc/sourcegraph \
--volume ~/.sourcegraph/data:/var/opt/sourcegraph \
sourcegraph/server:3.23.0
sourcegraph/server:3.24.0
```

> NOTE: We recommend removing `--publish 7080:7080` as it's not needed and traffic sent to that port is un-encrypted.
Expand Down
4 changes: 4 additions & 0 deletions doc/admin/updates/docker_compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Upgrades should happen across consecutive minor versions of Sourcegraph. For exa

<!-- GENERATE UPGRADE GUIDE ON RELEASE (release tooling uses this to add entries) -->

## 3.23 -> 3.24

Please upgrade to the [`v3.24.0` tag of deploy-sourcegraph-docker](https://github.com/sourcegraph/deploy-sourcegraph-docker/tree/v3.24.0/docker-compose) by following the [standard upgrade procedure](#standard-upgrade-procedure).

## 3.22 -> 3.23

No manual migration required.
Expand Down
4 changes: 4 additions & 0 deletions doc/admin/updates/kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Upgrades should happen across consecutive minor versions of Sourcegraph. For exa

<!-- GENERATE UPGRADE GUIDE ON RELEASE (release tooling uses this to add entries) -->

## 3.23 -> 3.24

No manual migration required, follow the [standard upgrade method](../install/kubernetes/update.md) to upgrade your deployment.

## 3.22 -> 3.23

No manual migration is required, follow the [standard upgrade method](../install/kubernetes/update.md) to upgrade your deployment.
Expand Down
6 changes: 6 additions & 0 deletions doc/admin/updates/pure_docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ Upgrades should happen across consecutive minor versions of Sourcegraph. For exa

**Always refer to this page before upgrading Sourcegraph,** as it comprehensively describes the steps needed to upgrade, and any manual migration steps you must perform.

## 3.23.0 -> 3.24.0

To upgrade, please perform the changes in the following diff:

https://github.com/sourcegraph/deploy-sourcegraph-docker/commit/4acc4c7ed5d49ce41b1f68d654a3f4e2f35bd622

## 3.22.0 -> 3.23.0

To upgrade, please perform the changes in the following diff:
Expand Down
2 changes: 1 addition & 1 deletion doc/dev/background-information/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -326,5 +326,5 @@ To manually test against a Kubernetes cluster, use https://k8s.sgdev.org.
For testing with a single Docker image, run something like

```
IMAGE=sourcegraph/server:3.23.0 ./dev/run-server-image.sh
IMAGE=sourcegraph/server:3.24.0 ./dev/run-server-image.sh
```
4 changes: 2 additions & 2 deletions doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ It takes less than 5 minutes to run and install Sourcegraph using Docker:
-->


<pre class="pre-wrap start-sourcegraph-command" id="dockerInstall"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --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.23.0<span class="iconify copy-text" data-icon="mdi:clipboard-arrow-left-outline" data-inline="false"></span></code>
<pre class="pre-wrap start-sourcegraph-command" id="dockerInstall"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --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.24.0<span class="iconify copy-text" data-icon="mdi:clipboard-arrow-left-outline" data-inline="false"></span></code>
</pre>

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.
Expand Down Expand Up @@ -54,7 +54,7 @@ We actively maintain the two most recent monthly releases of Sourcegraph.
Upgrades should happen across consecutive minor versions of Sourcegraph. For example, if you are
running Sourcegraph 3.1 and want to upgrade to 3.3, you should upgrade to 3.2 and then 3.3.

> The Docker server image tags follow SemVer semantics, so version `3.23.0` can be found at `sourcegraph/server:3.23.0`. You can see the full list of tags on our [Docker Hub page](https://hub.docker.com/r/sourcegraph/server/tags).
> The Docker server image tags follow SemVer semantics, so version `3.24.0` can be found at `sourcegraph/server:3.24.0`. You can see the full list of tags on our [Docker Hub page](https://hub.docker.com/r/sourcegraph/server/tags).
### Core documentation

Expand Down
2 changes: 1 addition & 1 deletion enterprise/dev/ci/ci/pipeline-steps.go
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func triggerE2EandQA(c Config, commonEnv map[string]string) func(*bk.Pipeline) {
env["VAGRANT_SERVICE_ACCOUNT"] = "buildkite@sourcegraph-ci.iam.gserviceaccount.com"

// Test upgrades from mininum upgradeable Sourcegraph version - updated by release tool
env["MINIMUM_UPGRADEABLE_VERSION"] = "3.23.0"
env["MINIMUM_UPGRADEABLE_VERSION"] = "3.24.0"

env["DOCKER_CLUSTER_IMAGES_TXT"] = clusterDockerImages(images.SourcegraphDockerImages)

Expand Down

0 comments on commit c416856

Please sign in to comment.