From 1261918fbc03e238b9129ef7d0778e0444305a0c Mon Sep 17 00:00:00 2001 From: davejrt <2067825+davejrt@users.noreply.github.com> Date: Wed, 20 Jan 2021 18:04:57 -0500 Subject: [PATCH] release: sourcegraph@3.24.0 (#17477) * draft sourcegraph@3.24.0 release * docs upgrade to 3.24 --- cmd/frontend/internal/app/updatecheck/handler.go | 6 +++--- doc/admin/external_services/postgres.md | 2 +- doc/admin/external_services/redis.md | 2 +- doc/admin/install/docker-compose/index.md | 4 ++-- doc/admin/install/docker/aws.md | 2 +- doc/admin/install/docker/digitalocean.md | 2 +- doc/admin/install/docker/google_cloud.md | 2 +- doc/admin/install/docker/index.md | 4 ++-- doc/admin/postgres.md | 2 +- doc/admin/pprof.md | 2 +- doc/admin/repo/custom_git_or_ssh_config.md | 2 +- doc/admin/ssl_https_self_signed_cert_nginx.md | 2 +- doc/admin/updates/docker_compose.md | 4 ++++ doc/admin/updates/kubernetes.md | 4 ++++ doc/admin/updates/pure_docker.md | 6 ++++++ doc/dev/background-information/testing.md | 2 +- doc/index.md | 4 ++-- enterprise/dev/ci/ci/pipeline-steps.go | 2 +- 18 files changed, 34 insertions(+), 20 deletions(-) diff --git a/cmd/frontend/internal/app/updatecheck/handler.go b/cmd/frontend/internal/app/updatecheck/handler.go index 7519936e28b2..31d972fcb78c 100644 --- a/cmd/frontend/internal/app/updatecheck/handler.go +++ b/cmd/frontend/internal/app/updatecheck/handler.go @@ -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 { diff --git a/doc/admin/external_services/postgres.md b/doc/admin/external_services/postgres.md index 9991fa8d9624..a0fdd16fbe2b 100644 --- a/doc/admin/external_services/postgres.md +++ b/doc/admin/external_services/postgres.md @@ -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. --> -
docker run [...] -e PGHOST=psql1.mycompany.org -e PGUSER=sourcegraph -e PGPASSWORD=secret -e PGDATABASE=sourcegraph -e PGSSLMODE=require -e CODEINTEL_PGHOST=psql2.mycompany.org -e CODEINTEL_PGUSER=sourcegraph -e CODEINTEL_PGPASSWORD=secret -e CODEINTEL_PGDATABASE=sourcegraph-codeintel -e CODEINTEL_PGSSLMODE=require sourcegraph/server:3.23.0
+
docker run [...] -e PGHOST=psql1.mycompany.org -e PGUSER=sourcegraph -e PGPASSWORD=secret -e PGDATABASE=sourcegraph -e PGSSLMODE=require -e CODEINTEL_PGHOST=psql2.mycompany.org -e CODEINTEL_PGUSER=sourcegraph -e CODEINTEL_PGPASSWORD=secret -e CODEINTEL_PGDATABASE=sourcegraph-codeintel -e CODEINTEL_PGSSLMODE=require sourcegraph/server:3.24.0
### Docker Compose diff --git a/doc/admin/external_services/redis.md b/doc/admin/external_services/redis.md index cd6c9da6495b..1aba979e4d88 100644 --- a/doc/admin/external_services/redis.md +++ b/doc/admin/external_services/redis.md @@ -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. --> -
docker run [...]   -e REDIS_ENDPOINT=redis.mycompany.org:6379   sourcegraph/server:3.23.0
+
docker run [...]   -e REDIS_ENDPOINT=redis.mycompany.org:6379   sourcegraph/server:3.24.0
> 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. diff --git a/doc/admin/install/docker-compose/index.md b/doc/admin/install/docker-compose/index.md index 3ad4cc37a187..9eaa4f90a91a 100644 --- a/doc/admin/install/docker-compose/index.md +++ b/doc/admin/install/docker-compose/index.md @@ -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 ``` @@ -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 ``` diff --git a/doc/admin/install/docker/aws.md b/doc/admin/install/docker/aws.md index 9632e4920879..50cf8f2b84d5 100644 --- a/doc/admin/install/docker/aws.md +++ b/doc/admin/install/docker/aws.md @@ -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: diff --git a/doc/admin/install/docker/digitalocean.md b/doc/admin/install/docker/digitalocean.md index 5ceda0a787ad..6280c16e968a 100644 --- a/doc/admin/install/docker/digitalocean.md +++ b/doc/admin/install/docker/digitalocean.md @@ -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. diff --git a/doc/admin/install/docker/google_cloud.md b/doc/admin/install/docker/google_cloud.md index 20c3edb14e8a..f173eb2e0263 100644 --- a/doc/admin/install/docker/google_cloud.md +++ b/doc/admin/install/docker/google_cloud.md @@ -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. diff --git a/doc/admin/install/docker/index.md b/doc/admin/install/docker/index.md index 7c5e8b852f01..2a634f82508d 100644 --- a/doc/admin/install/docker/index.md +++ b/doc/admin/install/docker/index.md @@ -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. --> -
docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --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 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.24.0
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. @@ -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: -
docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm sourcegraph/server:3.23.0
+
docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm sourcegraph/server:3.24.0
## Low resource environments diff --git a/doc/admin/postgres.md b/doc/admin/postgres.md index b11d74dfcda7..cb6957224edd 100644 --- a/doc/admin/postgres.md +++ b/doc/admin/postgres.md @@ -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). diff --git a/doc/admin/pprof.md b/doc/admin/pprof.md index 6b7cf3b510b7..1ae8125d1444 100644 --- a/doc/admin/pprof.md +++ b/doc/admin/pprof.md @@ -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 diff --git a/doc/admin/repo/custom_git_or_ssh_config.md b/doc/admin/repo/custom_git_or_ssh_config.md index 775efca5ff61..132920258267 100644 --- a/doc/admin/repo/custom_git_or_ssh_config.md +++ b/doc/admin/repo/custom_git_or_ssh_config.md @@ -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 diff --git a/doc/admin/ssl_https_self_signed_cert_nginx.md b/doc/admin/ssl_https_self_signed_cert_nginx.md index 9ef9f7206eb8..5cca71e119e6 100644 --- a/doc/admin/ssl_https_self_signed_cert_nginx.md +++ b/doc/admin/ssl_https_self_signed_cert_nginx.md @@ -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. diff --git a/doc/admin/updates/docker_compose.md b/doc/admin/updates/docker_compose.md index c59b6af9372a..a67d05277e22 100644 --- a/doc/admin/updates/docker_compose.md +++ b/doc/admin/updates/docker_compose.md @@ -11,6 +11,10 @@ Upgrades should happen across consecutive minor versions of Sourcegraph. For exa +## 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. diff --git a/doc/admin/updates/kubernetes.md b/doc/admin/updates/kubernetes.md index 3590f9e2fded..fbb50454daa3 100644 --- a/doc/admin/updates/kubernetes.md +++ b/doc/admin/updates/kubernetes.md @@ -11,6 +11,10 @@ Upgrades should happen across consecutive minor versions of Sourcegraph. For exa +## 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. diff --git a/doc/admin/updates/pure_docker.md b/doc/admin/updates/pure_docker.md index 219599cff501..f5c5dd430572 100644 --- a/doc/admin/updates/pure_docker.md +++ b/doc/admin/updates/pure_docker.md @@ -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: diff --git a/doc/dev/background-information/testing.md b/doc/dev/background-information/testing.md index 5f115a26acc7..3b6657fb2899 100644 --- a/doc/dev/background-information/testing.md +++ b/doc/dev/background-information/testing.md @@ -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 ``` diff --git a/doc/index.md b/doc/index.md index e8818563e38f..1d0631d572e9 100644 --- a/doc/index.md +++ b/doc/index.md @@ -16,7 +16,7 @@ It takes less than 5 minutes to run and install Sourcegraph using Docker: --> -
docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --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 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.24.0
 

 
 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.
@@ -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
 
diff --git a/enterprise/dev/ci/ci/pipeline-steps.go b/enterprise/dev/ci/ci/pipeline-steps.go
index f3f16bae7805..798e4359fe34 100644
--- a/enterprise/dev/ci/ci/pipeline-steps.go
+++ b/enterprise/dev/ci/ci/pipeline-steps.go
@@ -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)