Skip to content

Commit a42c61a

Browse files
joaofnfernandesjoaofnfernandes
authored
Merge pull request #419 from joaofnfernandes/ucp-1.1
Migrates UCP 1.1 docs with history
2 parents 936e228 + f110279 commit a42c61a

File tree

10 files changed

+25
-69
lines changed

10 files changed

+25
-69
lines changed

‎ucp/applications/test/docker-compose.yml‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎ucp/applications/test/example-wordpress.dab‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎ucp/installation/install-production.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ For each node that you want to add to your UCP cluster:
232232
1. Log into that node.
233233
234234
2. Use the join command, to join the node to the cluster:
235-
235+
236236
```none
237237
$ docker run --rm -it --name ucp \
238238
-v /var/run/docker.sock:/var/run/docker.sock \

‎ucp/installation/uninstall.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ You can also use flags to pass values to the uninstall command.
4343
INFO[0000] Were about to uninstall the local components for UCP ID: FEY4:M46O:7OUS:QQA4:HLR3:4HRD:IUTH:LC2W:QPRE:BLYH:UWEM:3TYV
4444
Do you want proceed with the uninstall? (y/n): y
4545
46-
WARN[0000] We detected a daemon advertisement configuration. Proceed with caution, as the daemon will require a restart. Press ctrl-c to cancel uninstall within 4 seconds.
46+
WARN[0000] We detected a daemon advertisement configuration. Proceed with caution, as the daemon will require a restart. Press ctrl-c to cancel uninstall within 4 seconds.
4747
INFO[0004] Removing UCP Containers
4848
INFO[0005] Removing UCP images
49-
WARN[0006] Configuration updated. You will have to manually restart the docker daemon for the changes to take effect.
50-
WARN[0006] Engine discovery configuration removed. You will need to restart the daemon.
49+
WARN[0006] Configuration updated. You will have to manually restart the docker daemon for the changes to take effect.
50+
WARN[0006] Engine discovery configuration removed. You will need to restart the daemon.
5151
INFO[0010] Removing UCP volumes
5252
```
5353

‎ucp/installation/upgrade.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ If your cluster is set up for high-availability (has several controller nodes):
166166
```
167167

168168
7. Upgrade the controller node.
169-
169+
170170
```none
171171
$ docker run --rm -it \
172172
--name ucp \

‎ucp/monitor/troubleshoot-ucp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ specially useful if the UCP web application is not working.
4545
permissions to see the UCP system containers.
4646

4747
2. Check the logs of UCP system containers.
48-
48+
4949
```none
5050
# By default system containers are not displayed. Use the -a flag to display them
5151
$ docker ps -a

‎ucp/reference/backup.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ built-in PGP compatible encryption.
4444

4545
## Options
4646

47-
| Option | Description |
48-
|:-----------------|:------------------------------------------------------------------------|
49-
| `--debug, -D` | Enable debug mode |
50-
| `--jsonlog` | Produce json formatted output for easier parsing |
51-
| `--id` | The ID of the UCP instance to backup |
52-
| `--root-ca-only` | Backup only the root CA certificates and keys from this controller node |
53-
| `--passphrase` | Encrypt the tar file with the provided passphrase [$UCP_PASSPHRASE] |
47+
| Option | Description |
48+
|:--------------------|:---------------------------------------------------------------------------------|
49+
| `--debug, -D` | Enable debug mode |
50+
| `--jsonlog` | Produce json formatted output for easier parsing |
51+
| `--id` | The ID of the UCP instance to backup |
52+
| `--root-ca-only` | Backup only the root CA certificates and keys from this controller node |
53+
| `--passphrase` | Encrypt the tar file with the provided passphrase [$UCP_PASSPHRASE] |
5454
| `--interactive, -i` | Enable interactive mode. You will be prompted to enter all required information. |

‎ucp/reference/install.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ mounting the file at '/docker_subscription.lic' in the tool. E.g.
5252
| `--admin-password` | Specify the UCP admin password [$UCP_ADMIN_PASSWORD] |
5353
| `--fresh-install` | Destroy any existing state and start fresh. |
5454
| `--san` `[--san option --san option]` | Additional Subject Alternative Names for certs (e.g. `--san foo1.bar.com --san foo2.bar.com`). |
55-
| `--host-address` | Specify the visible IP for this node. |
55+
| `--host-address` | Specify the visible IP for this node. |
5656
| `--swarm-port "2376"` | Select what port to run the local Swarm manager on (default: 2376) |
5757
| `--controller-port "443"` | Select what port to run the local Controller on (default: 443) |
5858
| `--dns` `[--dns option --dns option]` | Set custom DNS servers for the UCP infrastructure containers. |

‎ucp/reference/restore.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ must be provided.
4141

4242
## Options
4343

44-
| Option | Description |
45-
|:-----------------|:-------------------------------------------------------------------------------------------------------|
46-
| `--debug, -D` | Enable debug mode |
47-
| `--jsonlog` | Produce json formatted output for easier parsing |
48-
| `--id` | The ID of the UCP instance to backup |
49-
| `--root-ca-only` | Restore only the root CA certificates and keys on this controller node (leaving all other data intact) |
50-
| `--passphrase` | Decrypt the tar file with the provided passphrase [$UCP_PASSPHRASE] |
51-
| `--interactive, -i` | Enable interactive mode. You will be prompted to enter all required information. |
44+
| Option | Description |
45+
|:--------------------|:-------------------------------------------------------------------------------------------------------|
46+
| `--debug, -D` | Enable debug mode |
47+
| `--jsonlog` | Produce json formatted output for easier parsing |
48+
| `--id` | The ID of the UCP instance to backup |
49+
| `--root-ca-only` | Restore only the root CA certificates and keys on this controller node (leaving all other data intact) |
50+
| `--passphrase` | Decrypt the tar file with the provided passphrase [$UCP_PASSPHRASE] |
51+
| `--interactive, -i` | Enable interactive mode. You will be prompted to enter all required information. |

‎ucp/reference/upgrade.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ before proceeding to the next node.
3838

3939
| Option | Description |
4040
|:----------------------|:----------------------------------------------------------------------------------------|
41-
| `--debug, -D` | Enable debug |
42-
| `--jsonlog` | Produce json formatted output for easier parsing |
43-
| `--interactive, -i` | Enable interactive mode.,You will be prompted to enter all required information |
41+
| `--debug, -D` | Enable debug |
42+
| `--jsonlog` | Produce json formatted output for easier parsing |
43+
| `--interactive, -i` | Enable interactive mode.,You will be prompted to enter all required information |
4444
| `--admin-username` | Specify the UCP admin username [$UCP_ADMIN_USER] |
4545
| `--admin-password` | Specify the UCP admin password [$UCP_ADMIN_PASSWORD] |
4646
| `--registry-username` | Specify the username to pull required images with [$REGISTRY_USERNAME] |

0 commit comments

Comments
 (0)