Skip to content

Commit

Permalink
Merge pull request #4 from sourcegraph/ver
Browse files Browse the repository at this point in the history
server:latest -> server:CURRENT_VERSION everywhere
  • Loading branch information
dadlerj committed Oct 4, 2018
2 parents be80331 + 9e80747 commit f92073c
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 91 deletions.
2 changes: 1 addition & 1 deletion docs/server/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ For Sourcegraph instances running on a single node, follow these steps on the ma
```
$ docker ps
CONTAINER ID IMAGE
d039ec989761 sourcegraph/server:<server-version-number></server-version-number>
d039ec989761 sourcegraph/server:<server-version-number />
```
2. Open a PostgreSQL interactive terminal:
```
Expand Down
4 changes: 2 additions & 2 deletions docs/server/code-intelligence/install-manual-aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Generally you do not ever need to perform manual installation of code intelligen

```
docker network create --driver bridge lsp
docker run -d --publish 80:7080 --network lsp --name sourcegraph --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:latest
docker run -d --publish 80:7080 --network lsp --name sourcegraph --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:<server-version-number />
docker run -d --network=lsp --name=typescript --restart unless-stopped sourcegraph/codeintel-typescript:latest
```

Expand All @@ -53,7 +53,7 @@ Generally you do not ever need to perform manual installation of code intelligen
- service docker start
- usermod -a -G docker ec2-user
- [ sh, -c, 'docker network create --driver bridge lsp' ]
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7443 --network lsp --name sourcegraph --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:latest' ]
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7443 --network lsp --name sourcegraph --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:<server-version-number />' ]
- [ sh, -c, 'docker run -d --network=lsp --name=typescript --restart unless-stopped sourcegraph/codeintel-typescript:latest' ]
```

Expand Down
4 changes: 2 additions & 2 deletions docs/server/code-intelligence/install-manual-digitalocean.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Generally you do not ever need to perform manual installation of code intelligen

```
docker network create --driver bridge lsp
docker run -d --publish 80:7080 --network lsp --name sourcegraph --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:latest
docker run -d --publish 80:7080 --network lsp --name sourcegraph --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:<server-version-number />
docker run -d --network=lsp --name=typescript --restart unless-stopped sourcegraph/codeintel-typescript:latest
```

Expand All @@ -46,7 +46,7 @@ Generally you do not ever need to perform manual installation of code intelligen
- mkdir -p /root/.sourcegraph/config
- mkdir -p /root/.sourcegraph/data
- [ sh, -c, 'docker network create --driver bridge lsp' ]
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7443 --network lsp --name sourcegraph --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:latest' ]
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7443 --network lsp --name sourcegraph --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:<server-version-number />' ]
- [ sh, -c, 'docker run -d --network=lsp --name=typescript --restart unless-stopped sourcegraph/codeintel-typescript:latest' ]
```

Expand Down
4 changes: 2 additions & 2 deletions docs/server/code-intelligence/install-manual-gcp.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Generally you do not ever need to perform manual installation of code intelligen

```
docker network create --driver bridge lsp
docker run -d --publish 80:7080 --publish 443:7443 --network lsp --name sourcegraph --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:latest
docker run -d --publish 80:7080 --publish 443:7443 --network lsp --name sourcegraph --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:<server-version-number />
docker run -d --network=lsp --name=typescript --restart unless-stopped sourcegraph/codeintel-typescript:latest
```

Expand All @@ -47,7 +47,7 @@ Generally you do not ever need to perform manual installation of code intelligen
mkdir -p /root/.sourcegraph/config
mkdir -p /root/.sourcegraph/data
docker network create --driver bridge lsp
docker run -d --publish 80:7080 --publish 443:7443 --network lsp --name sourcegraph --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:latest
docker run -d --publish 80:7080 --publish 443:7443 --network lsp --name sourcegraph --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:<server-version-number />
docker run -d --network=lsp --name=typescript --restart unless-stopped sourcegraph/codeintel-typescript:latest
```

Expand Down
2 changes: 1 addition & 1 deletion docs/server/code-intelligence/install-manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ If you're already running the `sourcegraph/server` Docker image (as described in

Now, run the `sourcegraph/server` Docker image as described in the [quickstart](/docs), but with two additional flags: `--network=lsp` and `--name=sourcegraph`:

<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --rm<span class="virtual-br"></span> --network=lsp --name=sourcegraph<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:<server-version-number></server-version-number><span class="virtual-br"></span></code></pre>
<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --rm<span class="virtual-br"></span> --network=lsp --name=sourcegraph<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:<server-version-number /><span class="virtual-br"></span></code></pre>

### Run the language server containers

Expand Down
4 changes: 2 additions & 2 deletions docs/server/config/external-database.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You can use your own PostgreSQL server with Sourcegraph if you wish. For example

Simply add the standard PostgreSQL environment variables to your `docker run` command and Sourcegraph will use that PostgreSQL server instead of its built-in one. For example:

<pre class="pre-wrap"><code>docker run [...]<span class="virtual-br"></span> -e PGHOST=psql.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=disable<span class="virtual-br"></span> sourcegraph/server:latest</code></pre>
<pre class="pre-wrap"><code>docker run [...]<span class="virtual-br"></span> -e PGHOST=psql.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=disable<span class="virtual-br"></span> sourcegraph/server:<server-version-number /></code></pre>

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.

Expand All @@ -32,7 +32,7 @@ Generally, there is no reason to do this as Sourcegraph only stores ephemeral ca
Simply add the `REDIS_ENDPOINT` environment variable to your `docker run` command and Sourcegraph will use that Redis server instead of its built-in one. For example:

```
docker run [...] -e REDIS_ENDPOINT=redis.mycompany.org:6379 sourcegraph/server:latest
docker run [...] -e REDIS_ENDPOINT=redis.mycompany.org:6379 sourcegraph/server:<server-version-number />
```

<div class="alert alert-info">
Expand Down
73 changes: 0 additions & 73 deletions docs/server/config/sourcegraph.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions docs/server/deploy/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ If you're just starting out, we recommend [installing Sourcegraph locally](/docs
- sed -i -e 's/4096/40960/g' /etc/sysconfig/docker
- service docker start
- usermod -a -G docker ec2-user
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:latest' ]
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:<server-version-number />' ]
```

- 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")
Expand Down Expand Up @@ -97,7 +97,7 @@ To upgrade your existing instance to use automatic code intelligence, **SSH into
2. Start the Docker container again using the new `docker run` command provided in the updated user-data `#cloud-config` script above. i.e.:

```
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:latest
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:<server-version-number />
```

These steps only need to be performed once, and they will persist across machine restarts.
Expand Down
4 changes: 2 additions & 2 deletions docs/server/deploy/digitalocean.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ If you're just starting out, we recommend [installing Sourcegraph locally](/docs
runcmd:
- mkdir -p /root/.sourcegraph/config
- mkdir -p /root/.sourcegraph/data
- [ sh, -c, '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 --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:latest' ]
- [ sh, -c, '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 --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:<server-version-number />' ]
```

- Launch your instance, then navigate to its IP address.
Expand Down Expand Up @@ -79,7 +79,7 @@ To upgrade your existing instance to use automatic code intelligence, **SSH into
2. Start the Docker container again using the new `docker run` command provided in the updated user-data `#cloud-config` script above. i.e.:

```
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 --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:latest
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 --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:<server-version-number />
```

These steps only need to be performed once, and they will persist across machine restarts.
Expand Down
4 changes: 2 additions & 2 deletions docs/server/deploy/gcp.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ If you're just starting out, we recommend [installing Sourcegraph locally](/docs
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 --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:latest
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 --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:<server-version-number />
```

- Create your VM, then navigate to its public IP address.
Expand Down Expand Up @@ -80,7 +80,7 @@ To upgrade your existing instance to use automatic code intelligence, **SSH into
2. Start the Docker container again using the new `docker run` command provided in the updated user-data `#cloud-config` script above. i.e.:

```
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 --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:latest
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 --volume /var/run/docker.sock:/var/run/docker.sock sourcegraph/server:<server-version-number />
```

These steps only need to be performed once, and they will persist across machine restarts.
Expand Down
2 changes: 1 addition & 1 deletion docs/server/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permalink: docs

<div id="docker-command-docs">

<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --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> --volume /var/run/docker.sock:/var/run/docker.sock <span class="virtual-br"></span>sourcegraph/server:<server-version-number></server-version-number><span class="virtual-br"></span></code></pre>
<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --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> --volume /var/run/docker.sock:/var/run/docker.sock <span class="virtual-br"></span>sourcegraph/server:<server-version-number /><span class="virtual-br"></span></code></pre>

</div>

Expand Down
2 changes: 1 addition & 1 deletion docs/server/tutorials/tlsssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ For single-server Docker image deployments, add the following lines to your site

Next, restart your Sourcegraph instance using the same `docker run` [command](/docs), but map the host port to the container HTTPS port 7443 (not the HTTP port 7080). In this example, the host port 443 (HTTPS) is mapped to the container's HTTPS port 7443.

<div id="docker-command-docs"><pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 443:7443 --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> --volume /var/run/docker.sock:/var/run/docker.sock<span class="virtual-br"></span> sourcegraph/server:<server-version-number></server-version-number></code></pre></div>
<div id="docker-command-docs"><pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 443:7443 --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> --volume /var/run/docker.sock:/var/run/docker.sock<span class="virtual-br"></span> sourcegraph/server:<server-version-number /></code></pre></div>

If you are running on cloud infrastructure, you will likely need to add an ingress rule to make port 30443 accessible to the Internet.

0 comments on commit f92073c

Please sign in to comment.