From 4c5524e5fdf932178ef786fdff618c4f7f451b09 Mon Sep 17 00:00:00 2001 From: Beyang Liu Date: Thu, 9 Jan 2020 21:15:05 -0800 Subject: [PATCH] Update latest release to 3.11.4 (#7638) --- cmd/frontend/internal/app/pkg/updatecheck/handler.go | 4 ++-- doc/_resources/templates/document.html | 2 +- doc/admin/external_database.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/management_console.md | 2 +- doc/admin/postgres.md | 2 +- doc/admin/ssl_https_self_signed_cert_nginx.md | 2 +- doc/dev/testing.md | 2 +- doc/index.md | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cmd/frontend/internal/app/pkg/updatecheck/handler.go b/cmd/frontend/internal/app/pkg/updatecheck/handler.go index 03eea2aa445..c48470a72fc 100644 --- a/cmd/frontend/internal/app/pkg/updatecheck/handler.go +++ b/cmd/frontend/internal/app/pkg/updatecheck/handler.go @@ -27,12 +27,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.11.2") + latestReleaseDockerServerImageBuild = newBuild("3.11.4") // 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.11.2") + latestReleaseKubernetesBuild = newBuild("3.11.4") ) func getLatestRelease(deployType string) build { diff --git a/doc/_resources/templates/document.html b/doc/_resources/templates/document.html index 41df086f146..32379162247 100644 --- a/doc/_resources/templates/document.html +++ b/doc/_resources/templates/document.html @@ -13,7 +13,7 @@ - {{/* Update these after each release. */}} {{$previousReleaseRevspec := "v3.10.4"}} {{$previousReleaseVersion := "3.10"}} {{$currentReleaseRevspec := "v3.11.2"}} {{$currentReleaseVersion := "3.11"}} {{$nextReleaseVersion := "master"}} + {{/* Update these after each release. */}} {{$previousReleaseRevspec := "v3.10.4"}} {{$previousReleaseVersion := "3.10"}} {{$currentReleaseRevspec := "v3.11.4"}} {{$currentReleaseVersion := "3.11"}} {{$nextReleaseVersion := "master"}} master {{$currentReleaseVersion}}current {{$previousReleaseVersion}} diff --git a/doc/admin/external_database.md b/doc/admin/external_database.md index eeb5a11d4d3..146de819fc9 100644 --- a/doc/admin/external_database.md +++ b/doc/admin/external_database.md @@ -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. --> -
docker run [...] -e PGHOST=psql.mycompany.org -e PGUSER=sourcegraph -e PGPASSWORD=secret -e PGDATABASE=sourcegraph -e PGSSLMODE=require sourcegraph/server:3.11.2
+
docker run [...] -e PGHOST=psql.mycompany.org -e PGUSER=sourcegraph -e PGPASSWORD=secret -e PGDATABASE=sourcegraph -e PGSSLMODE=require sourcegraph/server:3.11.4
> NOTE: If your PostgreSQL server does not support SSL, set `PGSSLMODE=disable` instead of `PGSSLMODE=require`. Note that this is potentially insecure. @@ -40,7 +40,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.11.2
+
docker run [...]   -e REDIS_ENDPOINT=redis.mycompany.org:6379   sourcegraph/server:3.11.4
> 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/aws.md b/doc/admin/install/docker/aws.md index 030543e1c12..cd60eb872b7 100644 --- a/doc/admin/install/docker/aws.md +++ b/doc/admin/install/docker/aws.md @@ -34,7 +34,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.11.2' ] + - [ 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.11.4' ] ``` - 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 cfe68177cd4..3c722d0491f 100644 --- a/doc/admin/install/docker/digitalocean.md +++ b/doc/admin/install/docker/digitalocean.md @@ -16,7 +16,7 @@ If you're just starting out, we recommend [installing Sourcegraph locally](index 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.11.2 + 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.11.4 ``` 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 c2d4d9a57f0..eb03b55a399 100644 --- a/doc/admin/install/docker/google_cloud.md +++ b/doc/admin/install/docker/google_cloud.md @@ -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 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.11.2 + 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.11.4 ``` - 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 5ea131bdc43..5ecc85fc766 100644 --- a/doc/admin/install/docker/index.md +++ b/doc/admin/install/docker/index.md @@ -8,7 +8,7 @@ It takes less than 5 minutes 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.11.2
+
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.11.4
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. @@ -52,7 +52,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.11.2
+
docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm sourcegraph/server:3.11.4
## Insiders build diff --git a/doc/admin/management_console.md b/doc/admin/management_console.md index 9cb768c8244..e0c6171b697 100644 --- a/doc/admin/management_console.md +++ b/doc/admin/management_console.md @@ -15,7 +15,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.11.2 0.0.0.0:2633->2633/tcp, 0.0.0.0:7080->7080/tcp +394ff36a8c3c sourcegraph/server:3.11.4 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. diff --git a/doc/admin/postgres.md b/doc/admin/postgres.md index fd9cf9c0a69..0e41729a642 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.11.2 + sourcegraph/server:3.11.4 ``` **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/ssl_https_self_signed_cert_nginx.md b/doc/admin/ssl_https_self_signed_cert_nginx.md index acb08e0770c..fbf473c1f9e 100644 --- a/doc/admin/ssl_https_self_signed_cert_nginx.md +++ b/doc/admin/ssl_https_self_signed_cert_nginx.md @@ -89,7 +89,7 @@ docker container run \ \ --volume ~/.sourcegraph/config:/etc/sourcegraph \ --volume ~/.sourcegraph/data:/var/opt/sourcegraph \ - sourcegraph/server:3.11.2 + sourcegraph/server:3.11.4 ``` > 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/dev/testing.md b/doc/dev/testing.md index 6a0402093f5..9ceeea067fc 100644 --- a/doc/dev/testing.md +++ b/doc/dev/testing.md @@ -209,5 +209,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.11.2 ./dev/run-server-image.sh +IMAGE=sourcegraph/server:3.11.4 ./dev/run-server-image.sh ``` diff --git a/doc/index.md b/doc/index.md index ba232a8ab40..c1f1829e7af 100644 --- a/doc/index.md +++ b/doc/index.md @@ -12,7 +12,7 @@ It takes less than 5 minutes 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.11.2
+
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.11.4
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. @@ -48,7 +48,7 @@ We actively maintain the two most recent monthly releases of Sourcegraph, and we For example, if you are running Sourcegraph 3.1, then you can upgrade directly to 3.2 and 3.3. If you want to upgrade to 3.4, then you first need to upgrade to 3.3 before you can upgrade to 3.4. -> The Docker server image tags follow SemVer semantics, so version 3.8 can be found at `sourcegraph/server:3.11.2`. 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.8 can be found at `sourcegraph/server:3.11.4`. You can see the full list of tags on our [Docker Hub page](https://hub.docker.com/r/sourcegraph/server/tags). ## Documentation