Skip to content

Commit a22b9f6

Browse files
rmlovelandrmloveland
committed
Update with feedback from taroface & jhlodin
1 parent f42ceb1 commit a22b9f6

File tree

8 files changed

+24
-143
lines changed

8 files changed

+24
-143
lines changed

‎src/current/_includes/v25.2/misc/linux-binary-prereqs.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/current/_includes/v25.2/performance/scale-cluster.md‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
1. SSH to one of the `n2-standard-4` instances in the `us-west1-a` zone.
22

3-
1. Download [CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}), extract the binary, and copy it into the `PATH`:
4-
5-
{% include_cached copy-clipboard.html %}
6-
~~~ shell
7-
tar -xz cockroach-{{ page.release_info.version }}.linux-amd64.tgz
8-
~~~
9-
10-
{% include_cached copy-clipboard.html %}
11-
~~~ shell
12-
$ sudo cp -i cockroach-{{ page.release_info.version }}.linux-amd64/cockroach /usr/local/bin/
13-
~~~
3+
1. [Install CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}).
144

155
1. Run the [`cockroach start`]({% link {{ page.version.version }}/cockroach-start.md %}) command:
166

@@ -30,17 +20,7 @@
3020

3121
1. SSH to one of the `n2-standard-4` instances in the `us-west2-a` zone.
3222

33-
1. Download [CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}), extract the binary, and copy it into the `PATH`:
34-
35-
{% include_cached copy-clipboard.html %}
36-
~~~ shell
37-
tar -xz cockroach-{{ page.release_info.version }}.linux-amd64.tgz
38-
~~~
39-
40-
{% include_cached copy-clipboard.html %}
41-
~~~ shell
42-
$ sudo cp -i cockroach-{{ page.release_info.version }}.linux-amd64/cockroach /usr/local/bin/
43-
~~~
23+
1. [Install CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}).
4424

4525
1. Run the [`cockroach start`]({% link {{ page.version.version }}/cockroach-start.md %}) command:
4626

‎src/current/_includes/v25.2/performance/start-cluster.md‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,7 @@
22

33
1. SSH to the first `n2-standard-4` instance.
44

5-
1. Download [CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}), extract the binary, and copy it into the `PATH`:
6-
7-
{% include_cached copy-clipboard.html %}
8-
~~~ shell
9-
tar -xz cockroach-{{ page.release_info.version }}.linux-amd64.tgz
10-
~~~
11-
12-
{% include_cached copy-clipboard.html %}
13-
~~~ shell
14-
$ sudo cp -i cockroach-{{ page.release_info.version }}.linux-amd64/cockroach /usr/local/bin/
15-
~~~
5+
1. [Install CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}).
166

177
1. Run the [`cockroach start`]({% link {{ page.version.version }}/cockroach-start.md %}) command:
188

@@ -34,19 +24,7 @@
3424

3525
1. SSH to the fourth instance, the one not running a CockroachDB node.
3626

37-
1. Download [CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}), extract the binary, and copy it into the `PATH`:
38-
39-
{% include_cached copy-clipboard.html %}
40-
~~~ shell
41-
tar -xz cockroach-{{ page.release_info.version }}.linux-amd64.tgz
42-
~~~
43-
44-
1. Copy the binary into the `PATH`:
45-
46-
{% include_cached copy-clipboard.html %}
47-
~~~ shell
48-
$ sudo cp -i cockroach-{{ page.release_info.version }}.linux-amd64/cockroach /usr/local/bin/
49-
~~~
27+
1. [Install CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}).
5028

5129
1. Run the [`cockroach init`]({% link {{ page.version.version }}/cockroach-init.md %}) command:
5230

‎src/current/_includes/v25.2/prod-deployment/insecure-scale-cluster.md‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,7 @@ For each additional node you want to add to the cluster, complete the following
1212

1313
1. SSH to the machine where you want the node to run.
1414

15-
1. Download [CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}), extract the binary, and copy it into the `PATH`:
16-
17-
{% include_cached copy-clipboard.html %}
18-
~~~ shell
19-
tar -xz cockroach-{{ page.release_info.version }}.linux-amd64.tgz
20-
~~~
21-
22-
1. Copy the binary into the `PATH`:
23-
24-
{% include_cached copy-clipboard.html %}
25-
~~~ shell
26-
$ cp -i cockroach-{{ page.release_info.version }}.linux-amd64/cockroach /usr/local/bin/
27-
~~~
28-
29-
If you get a permissions error, prefix the command with `sudo`.
15+
1. [Install CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}).
3016

3117
1. Run the [`cockroach start`]({% link {{ page.version.version }}/cockroach-start.md %}) command, passing the new node's address as the `--advertise-addr` flag and pointing `--join` to the three existing nodes (also include `--locality` if you set it earlier).
3218

@@ -51,21 +37,7 @@ For each additional node you want to add to the cluster, complete the following
5137

5238
1. SSH to the machine where you want the node to run. Ensure you are logged in as the `root` user.
5339

54-
1. Download the [CockroachDB archive](https://binaries.cockroachdb.com/cockroach-{{ page.release_info.version }}.linux-amd64.tgz) for Linux, and extract the binary:
55-
56-
{% include_cached copy-clipboard.html %}
57-
~~~ shell
58-
curl -o cockroach-{{ page.release_info.version }}.linux-amd64.tgz; tar xzvf cockroach-{{ page.release_info.version }}.linux-amd64.tgz
59-
~~~
60-
61-
1. Copy the binary into the `PATH`:
62-
63-
{% include_cached copy-clipboard.html %}
64-
~~~ shell
65-
cp -i cockroach-{{ page.release_info.version }}.linux-amd64/cockroach /usr/local/bin/
66-
~~~
67-
68-
If you get a permissions error, prefix the command with `sudo`.
40+
1. [Install CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}).
6941

7042
1. Create the Cockroach directory:
7143

‎src/current/_includes/v25.2/prod-deployment/insecure-start-nodes.md‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -59,40 +59,7 @@ After completing these steps, nodes will not yet be live. They will complete the
5959

6060
1. SSH to the machine where you want the node to run. Ensure you are logged in as the `root` user.
6161

62-
1. Download [CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}), extract the binary, and copy it into the `PATH`:
63-
64-
{% include_cached copy-clipboard.html %}
65-
~~~ shell
66-
tar -xz cockroach-{{ page.release_info.version }}.linux-amd64.tgz
67-
~~~
68-
69-
1. Copy the binary into the `PATH`:
70-
71-
{% include_cached copy-clipboard.html %}
72-
~~~ shell
73-
$ cp -i cockroach-{{ page.release_info.version }}.linux-amd64/cockroach /usr/local/bin/
74-
~~~
75-
76-
If you get a permissions error, prefix the command with `sudo`.
77-
78-
1. CockroachDB uses custom-built versions of the [GEOS]({% link {{ page.version.version }}/architecture/glossary.md %}#geos) libraries. Copy these libraries to the location where CockroachDB expects to find them:
79-
80-
{% include_cached copy-clipboard.html %}
81-
~~~ shell
82-
$ mkdir -p /usr/local/lib/cockroach
83-
~~~
84-
85-
{% include_cached copy-clipboard.html %}
86-
~~~ shell
87-
$ cp -i cockroach-{{ page.release_info.version }}.linux-amd64/lib/libgeos.so /usr/local/lib/cockroach/
88-
~~~
89-
90-
{% include_cached copy-clipboard.html %}
91-
~~~ shell
92-
$ cp -i cockroach-{{ page.release_info.version }}.linux-amd64/lib/libgeos_c.so /usr/local/lib/cockroach/
93-
~~~
94-
95-
If you get a permissions error, prefix the command with `sudo`.
62+
1. [Install CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}).
9663

9764
1. Create the Cockroach directory:
9865

‎src/current/_includes/v25.2/prod-deployment/secure-scale-cluster.md‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,7 @@ For each additional node you want to add to the cluster, complete the following
5151
5252
1. SSH to the machine where you want the node to run. Ensure you are logged in as the `root` user.
5353
54-
1. Download the [CockroachDB archive](https://binaries.cockroachdb.com/cockroach-{{ page.release_info.version }}.linux-amd64.tgz) for Linux, and extract the binary:
55-
56-
{% include_cached copy-clipboard.html %}
57-
~~~ shell
58-
curl -o cockroach-{{ page.release_info.version }}.linux-amd64.tgz https://binaries.cockroachdb.com/cockroach-{{ page.release_info.version }}.linux-amd64.tgz; tar xzvf cockroach-{{ page.release_info.version }}.linux-amd64.tgz
59-
~~~
60-
61-
1. Copy the binary into the `PATH`:
62-
63-
{% include_cached copy-clipboard.html %}
64-
~~~ shell
65-
cp -i cockroach-{{ page.release_info.version }}.linux-amd64/cockroach /usr/local/bin/
66-
~~~
67-
68-
If you get a permissions error, prefix the command with `sudo`.
54+
1. [Install CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}).
6955
7056
1. Create the Cockroach directory:
7157

‎src/current/v25.2/install-cockroachdb-linux.md‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,21 @@ Use one of the options below to install CockroachDB. To upgrade an existing clus
2525

2626
<div id="download-the-binary-linux" class="install-option">
2727
<h2 id="install-binary">Download the binary</h2>
28-
{% include {{ page.version.version }}/misc/linux-binary-prereqs.md %}
28+
<p>The CockroachDB binary for Linux requires <code>glibc</code>, <code>libncurses</code>, and <code>tzdata</code>, which are found by default on nearly all Linux distributions.</p>
2929
<ol>
3030
<li>
31-
<p>Visit <a href="/docs/releases/index.html">Releases</a> to download the CockroachDB archive for the architecture of your Linux host. The archive contains the <code>cockroach</code> binary and the supporting libraries that are used to provide <a href="{% link {{ page.version.version }}/spatial-data-overview.md %}">spatial features</a>. Extract the archive and optionally copy the <code>cockroach</code> binary into your <code>PATH</code> so you can execute <a href="cockroach-commands.html">cockroach commands</a> from any shell. If you get a permission error, use <code>sudo</code>.</p>
31+
<p>Visit <a href="/docs/releases/index.html">Releases</a> to download the CockroachDB archive for the architecture of your Linux host. The archive contains the <code>cockroach</code> binary and the supporting libraries that are used to provide <a href="{% link {{ page.version.version }}/spatial-data-overview.md %}">spatial features</a>. Follow the steps shown below to install the <code>cockroach</code> binary into your <code>PATH</code> so you can execute <a href="cockroach-commands.html">cockroach commands</a> from any shell.</p>
32+
<ol>
33+
<li>
34+
Download the binary you want from the <a href="/docs/releases/index.html">Releases</a> page.
35+
</li>
36+
<li>Extract the archive:
37+
<div class="highlight"><pre><code class="language-shell" data-lang="shell"><span class="nb">tar</span><span class="nt">-xz</span> cockroach-{VERSION}.linux-{ARCHITECTURE}.tgz</code></pre></div>
38+
</li>
39+
<li>Copy the <code>cockroach</code> binary into your <code>PATH</code>:
40+
<div class="highlight"><pre><code class="language-shell" data-lang="shell"><span class="nb">cp</span> <span class="nt">-i</span> cockroach-{VERSION}.linux-{ARCHITECTURE}/cockroach /usr/local/bin/</code></pre></div>
41+
</li>
42+
</ol>
3243
</li>
3344
<div class="bs-callout bs-callout--info"><div class="bs-callout__label">Note:</div>
3445
<p>If you plan to use CockroachDB's <a href="{% link {{ page.version.version }}/spatial-data-overview.md %}">spatial features</a>, you must complete the following steps. Otherwise, your installation is now complete.</p>
@@ -49,12 +60,12 @@ Use one of the options below to install CockroachDB. To upgrade an existing clus
4960
<svg id="copy-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12"><style>.st0{fill:#A2A2A2;}</style><title>icon/buttons/copy</title><g id="Mask"><path id="path-1_1_" class="st0" d="M4.9 4.9v6h6v-6h-6zM3.8 3.8H12V12H3.8V3.8zM2.7 7.1v1.1H.1S0 5.5 0 0h8.2v2.7H7.1V1.1h-6v6h1.6z"/></g></svg>
5061
<svg id="copy-check" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 10"><style>.st1{fill:#54B30E;}</style><path id="path-1_2_" class="st1" d="M3.8 9.1c-.3 0-.5-.1-.6-.2L.3 6C0 5.7-.1 5.2.2 4.8c.3-.4.9-.4 1.3-.1L3.8 7 10.6.2c.3-.3.9-.4 1.2 0 .3.3.3.9 0 1.2L4.4 8.9c-.2.1-.4.2-.6.2z"/></svg>
5162
</div>
52-
<div class="highlight"><pre><code class="language-shell" data-lang="shell"><span class="nb">cp </span>-i cockroach-{{ page.release_info.version }}.linux-{ARCHITECTURE}/lib/libgeos.so /usr/local/lib/cockroach/</code></pre></div>
63+
<div class="highlight"><pre><code class="language-shell" data-lang="shell"><span class="nb">cp </span>-i cockroach-{VERSION}.linux-{ARCHITECTURE}/lib/libgeos.so /usr/local/lib/cockroach/</code></pre></div>
5364
<div class="copy-clipboard">
5465
<svg id="copy-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12"><style>.st0{fill:#A2A2A2;}</style><title>icon/buttons/copy</title><g id="Mask"><path id="path-1_1_" class="st0" d="M4.9 4.9v6h6v-6h-6zM3.8 3.8H12V12H3.8V3.8zM2.7 7.1v1.1H.1S0 5.5 0 0h8.2v2.7H7.1V1.1h-6v6h1.6z"/></g></svg>
5566
<svg id="copy-check" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 10"><style>.st1{fill:#54B30E;}</style><path id="path-1_2_" class="st1" d="M3.8 9.1c-.3 0-.5-.1-.6-.2L.3 6C0 5.7-.1 5.2.2 4.8c.3-.4.9-.4 1.3-.1L3.8 7 10.6.2c.3-.3.9-.4 1.2 0 .3.3.3.9 0 1.2L4.4 8.9c-.2.1-.4.2-.6.2z"/></svg>
5667
</div>
57-
<div class="highlight"><pre><code class="language-shell" data-lang="shell"><span class="nb">cp </span>-i cockroach-{{ page.release_info.version }}.linux-{ARCHITECTURE}/lib/libgeos_c.so /usr/local/lib/cockroach/</code></pre></div>
68+
<div class="highlight"><pre><code class="language-shell" data-lang="shell"><span class="nb">cp </span>-i cockroach-{VERSION}.linux-{ARCHITECTURE}/lib/libgeos_c.so /usr/local/lib/cockroach/</code></pre></div>
5869
<p>If you get a permissions error, prefix the command with <code>sudo</code>.</p>
5970
</li>
6071
</ol>

‎src/current/v25.2/performance-benchmarking-with-tpcc-large.md‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -173,19 +173,7 @@ CockroachDB comes with a number of [built-in workloads]({% link {{ page.version.
173173
174174
1. SSH to the VM where you want to run TPC-C.
175175
176-
1. Download [CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}), extract the binary, and copy it into the `PATH`:
177-
178-
{% include_cached copy-clipboard.html %}
179-
~~~ shell
180-
tar -xz cockroach-{{ page.release_info.version }}.linux-amd64.tgz
181-
~~~
182-
183-
{% include_cached copy-clipboard.html %}
184-
~~~ shell
185-
$ cp -i cockroach-{{ page.release_info.version }}.linux-amd64/cockroach /usr/local/bin/
186-
~~~
187-
188-
If you get a permissions error, prefix the command with `sudo`.
176+
1. [Install CockroachDB for Linux]({% link {{ page.version.version }}/install-cockroachdb-linux.md %}).
189177
190178
1. Import the TPC-C dataset:
191179

0 commit comments

Comments
 (0)