From 3db9ad15d2b63f76ca2896659b9e14e856cca45e Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 19 Apr 2019 17:47:09 -0700 Subject: [PATCH 1/2] doc: Release Sourcegraph 3.3.0 ``` find . -type f -name '*.md' -exec sed -i '' -E 's/sourcegraph\/server:[0-9\.]+/sourcegraph\/server:3.3.0/g' {} + ``` --- 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/index.md | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/admin/external_database.md b/doc/admin/external_database.md index e0fc4d69558f..4ca9ea2dbed6 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=disable sourcegraph/server:3.2.2
+
docker run [...] -e PGHOST=psql.mycompany.org -e PGUSER=sourcegraph -e PGPASSWORD=secret -e PGDATABASE=sourcegraph -e PGSSLMODE=disable sourcegraph/server:3.3.0
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. @@ -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. --> -
docker run [...]   -e REDIS_ENDPOINT=redis.mycompany.org:6379   sourcegraph/server:3.2.2
+
docker run [...]   -e REDIS_ENDPOINT=redis.mycompany.org:6379   sourcegraph/server:3.3.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 165c2516187d..0d66a72a764e 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.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") diff --git a/doc/admin/install/docker/digitalocean.md b/doc/admin/install/docker/digitalocean.md index bbec9e7f8d33..06c0085e942b 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.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. diff --git a/doc/admin/install/docker/google_cloud.md b/doc/admin/install/docker/google_cloud.md index 984ee13ab384..1fd3038a4066 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.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. diff --git a/doc/admin/install/docker/index.md b/doc/admin/install/docker/index.md index 8cba824c74d2..d1a88f60c720 100644 --- a/doc/admin/install/docker/index.md +++ b/doc/admin/install/docker/index.md @@ -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. --> -
docker run --publish 7080:7080 --publish 2633:2633 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.2.2
+
docker run --publish 7080:7080 --publish 2633:2633 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.3.0
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.

diff --git a/doc/admin/management_console.md b/doc/admin/management_console.md index fbbd8a055b16..a0a20f37a836 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.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. diff --git a/doc/admin/postgres.md b/doc/admin/postgres.md index 8274d98bd41e..43afd9cfff0a 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.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). diff --git a/doc/admin/ssl_https_self_signed_cert_nginx.md b/doc/admin/ssl_https_self_signed_cert_nginx.md index 772aa2820da7..1e37989ecf06 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.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. diff --git a/doc/index.md b/doc/index.md index ac78c803ddb2..09c988a71371 100644 --- a/doc/index.md +++ b/doc/index.md @@ -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. --> -

docker run --publish 7080:7080 --publish 2633:2633 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.2.2
+
docker run --publish 7080:7080 --publish 2633:2633 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.3.0
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. From 335cbcf9bc77827addc92e53d6b0935ac7bc1709 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 19 Apr 2019 17:49:44 -0700 Subject: [PATCH 2/2] Release 3.3.0 --- cmd/frontend/internal/app/pkg/updatecheck/handler.go | 4 ++-- doc/_resources/templates/doc.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/frontend/internal/app/pkg/updatecheck/handler.go b/cmd/frontend/internal/app/pkg/updatecheck/handler.go index 2a69b60f8ae0..2e46704e5efe 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.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 { diff --git a/doc/_resources/templates/doc.html b/doc/_resources/templates/doc.html index 4ee0630c3858..7bccf3be472a 100644 --- a/doc/_resources/templates/doc.html +++ b/doc/_resources/templates/doc.html @@ -31,9 +31,9 @@