From faab38e6766c22adfaaac8f64e8e50807542a3d7 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Sat, 20 Jul 2019 19:09:53 +0200 Subject: [PATCH] 3.6.0 release updates (#4950) * Update docs to point to 3.6.0 * updatecheck: Set latestRelease to 3.6.0 * update docs.sourcegraph.com header --- cmd/frontend/internal/app/pkg/updatecheck/handler.go | 4 ++-- doc/_resources/templates/doc.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 | 2 +- doc/admin/management_console.md | 2 +- doc/admin/postgres.md | 2 +- doc/admin/ssl_https_self_signed_cert_nginx.md | 2 +- doc/dev/release_issue_template.md | 4 +++- doc/index.md | 4 ++-- 12 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cmd/frontend/internal/app/pkg/updatecheck/handler.go b/cmd/frontend/internal/app/pkg/updatecheck/handler.go index 11075059f757..39ec4be9b94f 100644 --- a/cmd/frontend/internal/app/pkg/updatecheck/handler.go +++ b/cmd/frontend/internal/app/pkg/updatecheck/handler.go @@ -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.5.2") + latestReleaseDockerServerImageBuild = newBuild("3.6.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.5.2") + latestReleaseKubernetesBuild = newBuild("3.6.0") ) func getLatestRelease(deployType string) build { diff --git a/doc/_resources/templates/doc.html b/doc/_resources/templates/doc.html index 5c46c6382d91..ece9494fecd3 100644 --- a/doc/_resources/templates/doc.html +++ b/doc/_resources/templates/doc.html @@ -26,7 +26,7 @@ - {{/* Update these after each release. */}} {{$previousReleaseRevspec := "v3.4.5"}} {{$previousReleaseVersion := "3.4"}} {{$currentReleaseRevspec := "v3.5.2"}} {{$currentReleaseVersion := "3.5"}} {{$nextReleaseVersion := "master"}} + {{/* Update these after each release. */}} {{$previousReleaseRevspec := "v3.5.2"}} {{$previousReleaseVersion := "3.5"}} {{$currentReleaseRevspec := "v3.6.0"}} {{$currentReleaseVersion := "3.6"}} {{$nextReleaseVersion := "master"}} master {{$currentReleaseVersion}}current {{$previousReleaseVersion}} diff --git a/doc/admin/external_database.md b/doc/admin/external_database.md index 7554f404f9a4..ffef360e98f3 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.5.2
+
docker run [...] -e PGHOST=psql.mycompany.org -e PGUSER=sourcegraph -e PGPASSWORD=secret -e PGDATABASE=sourcegraph -e PGSSLMODE=require sourcegraph/server:3.6.0
> NOTE: If your PostgreSQL server does not support SSL, set `PGSSLMODE=disable` instead of `PGSSLMODE=require`. Note that this is potentially insecure. @@ -40,6 +40,6 @@ 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.5.2
+
docker run [...]   -e REDIS_ENDPOINT=redis.mycompany.org:6379   sourcegraph/server:3.6.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/aws.md b/doc/admin/install/docker/aws.md index 4710f8ad9726..ac19813e2efd 100644 --- a/doc/admin/install/docker/aws.md +++ b/doc/admin/install/docker/aws.md @@ -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.5.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.6.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") diff --git a/doc/admin/install/docker/digitalocean.md b/doc/admin/install/docker/digitalocean.md index f8e4c73ba218..0f866a37d367 100644 --- a/doc/admin/install/docker/digitalocean.md +++ b/doc/admin/install/docker/digitalocean.md @@ -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.5.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.6.0' ] ``` - Launch your instance, then navigate to its IP address. diff --git a/doc/admin/install/docker/google_cloud.md b/doc/admin/install/docker/google_cloud.md index ec0bbfd9fec6..a0df42047da4 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 --publish 2633:2633 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.5.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.6.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 3908b5b4a183..2b753f4be74d 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 2633:2633 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.5.2
+
docker run --publish 7080:7080 --publish 2633:2633 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.6.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. diff --git a/doc/admin/management_console.md b/doc/admin/management_console.md index 849f9da64669..bd0a4fe4906c 100644 --- a/doc/admin/management_console.md +++ b/doc/admin/management_console.md @@ -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.5.2 0.0.0.0:2633->2633/tcp, 0.0.0.0:7080->7080/tcp +394ff36a8c3c sourcegraph/server:3.6.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. diff --git a/doc/admin/postgres.md b/doc/admin/postgres.md index 1050cf32dee1..069e9fb75745 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.5.2 + sourcegraph/server:3.6.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/ssl_https_self_signed_cert_nginx.md b/doc/admin/ssl_https_self_signed_cert_nginx.md index c537980b5aa0..e0edbf1c5b01 100644 --- a/doc/admin/ssl_https_self_signed_cert_nginx.md +++ b/doc/admin/ssl_https_self_signed_cert_nginx.md @@ -86,7 +86,7 @@ docker container run \ \ --volume ~/.sourcegraph/config:/etc/sourcegraph \ --volume ~/.sourcegraph/data:/var/opt/sourcegraph \ - sourcegraph/server:3.5.2 + sourcegraph/server:3.6.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/dev/release_issue_template.md b/doc/dev/release_issue_template.md index 2be093859bdd..f37c7bd8645d 100644 --- a/doc/dev/release_issue_template.md +++ b/doc/dev/release_issue_template.md @@ -108,7 +108,9 @@ Run a find replace on: - [ ] Open (but do not merge) PRs that do the following: - [ ] Update the documented version of Sourcegraph ([example](https://github.com/sourcegraph/sourcegraph/pull/2370/commits/701780fefa5809abb16669c9fb29738ec3bb2039)). ``` - find . -type f -name '*.md' -exec sed -i '' -E 's/sourcegraph\/server:[0-9\.]+/sourcegraph\/server:$NEWVERSION/g' {} + + find . -type f -name '*.md' -exec sed -i '' -E 's/sourcegraph\/server:[0-9\.]+/sourcegraph\/server:MAJOR.MINOR.0/g' {} + + # Or use ruplacer + ruplacer --go -t md 'sourcegraph/server:[0-9\.]+' 'sourcegraph/server:MAJOR.MINOR.0' ``` - [ ] Update `latestReleaseKubernetesBuild` and `latestReleaseDockerServerImageBuild` ([example](https://github.com/sourcegraph/sourcegraph/pull/2370/commits/15925f2769564225e37013acb52d9d0b30e1336c)). - [ ] [Update deploy-aws version](https://github.com/sourcegraph/deploy-sourcegraph-aws/edit/master/ec2/resources/user-data.sh#L3) diff --git a/doc/index.md b/doc/index.md index 33c2387372f8..6f0fd9795c1c 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 2633:2633 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.5.2
+
docker run --publish 7080:7080 --publish 2633:2633 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.6.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. @@ -37,7 +37,7 @@ We actively maintain the two most recent [monthly releases of Sourcegraph](dev/r 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.5 can be found at `sourcegraph/server:3.5.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.5 can be found at `sourcegraph/server:3.6.0`. You can see the full list of tags on our [Docker Hub page](https://hub.docker.com/r/sourcegraph/server/tags). ## Documentation