diff --git a/ucp/applications/test/docker-compose.yml b/ucp/applications/test/docker-compose.yml deleted file mode 100644 index 30cf0e03d63..00000000000 --- a/ucp/applications/test/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '2' - -services: - - wordpress: - image: wordpress - ports: - - 8080:80 - environment: - WORDPRESS_DB_PASSWORD: example - - mysql: - image: mariadb - environment: - MYSQL_ROOT_PASSWORD: example diff --git a/ucp/applications/test/example-wordpress.dab b/ucp/applications/test/example-wordpress.dab deleted file mode 100644 index da8f8127bdd..00000000000 --- a/ucp/applications/test/example-wordpress.dab +++ /dev/null @@ -1,29 +0,0 @@ -{ - "Services": { - "mysql": { - "Env": [ - "MYSQL_ROOT_PASSWORD=example" - ], - "Image": "mariadb@sha256:b145a81f15367428ad3a53434f6da63d560146a89e4d035c4ab7912af8d8d4b3", - "Networks": [ - "default" - ] - }, - "wordpress": { - "Env": [ - "WORDPRESS_DB_PASSWORD=example" - ], - "Image": "wordpress@sha256:191b14e74c287ec634df9ddebe5e4c7e2aafa02da0d51cc1795d5773e40db64c", - "Networks": [ - "default" - ], - "Ports": [ - { - "Port": 80, - "Protocol": "tcp" - } - ] - } - }, - "Version": "0.1" -} \ No newline at end of file diff --git a/ucp/installation/install-production.md b/ucp/installation/install-production.md index b82fd79a5a4..140b7698acf 100644 --- a/ucp/installation/install-production.md +++ b/ucp/installation/install-production.md @@ -232,7 +232,7 @@ For each node that you want to add to your UCP cluster: 1. Log into that node. 2. Use the join command, to join the node to the cluster: - + ```none $ docker run --rm -it --name ucp \ -v /var/run/docker.sock:/var/run/docker.sock \ diff --git a/ucp/installation/uninstall.md b/ucp/installation/uninstall.md index 563a1d21c11..58de2615bb4 100644 --- a/ucp/installation/uninstall.md +++ b/ucp/installation/uninstall.md @@ -43,11 +43,11 @@ You can also use flags to pass values to the uninstall command. INFO[0000] Were about to uninstall the local components for UCP ID: FEY4:M46O:7OUS:QQA4:HLR3:4HRD:IUTH:LC2W:QPRE:BLYH:UWEM:3TYV Do you want proceed with the uninstall? (y/n): y - 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. + 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. INFO[0004] Removing UCP Containers INFO[0005] Removing UCP images - WARN[0006] Configuration updated. You will have to manually restart the docker daemon for the changes to take effect. - WARN[0006] Engine discovery configuration removed. You will need to restart the daemon. + WARN[0006] Configuration updated. You will have to manually restart the docker daemon for the changes to take effect. + WARN[0006] Engine discovery configuration removed. You will need to restart the daemon. INFO[0010] Removing UCP volumes ``` diff --git a/ucp/installation/upgrade.md b/ucp/installation/upgrade.md index 692b81a2e08..1de58d469fa 100644 --- a/ucp/installation/upgrade.md +++ b/ucp/installation/upgrade.md @@ -166,7 +166,7 @@ If your cluster is set up for high-availability (has several controller nodes): ``` 7. Upgrade the controller node. - + ```none $ docker run --rm -it \ --name ucp \ diff --git a/ucp/monitor/troubleshoot-ucp.md b/ucp/monitor/troubleshoot-ucp.md index 7be05147f2c..f8936ea1918 100644 --- a/ucp/monitor/troubleshoot-ucp.md +++ b/ucp/monitor/troubleshoot-ucp.md @@ -45,7 +45,7 @@ specially useful if the UCP web application is not working. permissions to see the UCP system containers. 2. Check the logs of UCP system containers. - + ```none # By default system containers are not displayed. Use the -a flag to display them $ docker ps -a diff --git a/ucp/reference/backup.md b/ucp/reference/backup.md index 73d7381412d..aafb0fc0772 100644 --- a/ucp/reference/backup.md +++ b/ucp/reference/backup.md @@ -44,11 +44,11 @@ built-in PGP compatible encryption. ## Options -| Option | Description | -|:-----------------|:------------------------------------------------------------------------| -| `--debug, -D` | Enable debug mode | -| `--jsonlog` | Produce json formatted output for easier parsing | -| `--id` | The ID of the UCP instance to backup | -| `--root-ca-only` | Backup only the root CA certificates and keys from this controller node | -| `--passphrase` | Encrypt the tar file with the provided passphrase [$UCP_PASSPHRASE] | +| Option | Description | +|:--------------------|:---------------------------------------------------------------------------------| +| `--debug, -D` | Enable debug mode | +| `--jsonlog` | Produce json formatted output for easier parsing | +| `--id` | The ID of the UCP instance to backup | +| `--root-ca-only` | Backup only the root CA certificates and keys from this controller node | +| `--passphrase` | Encrypt the tar file with the provided passphrase [$UCP_PASSPHRASE] | | `--interactive, -i` | Enable interactive mode. You will be prompted to enter all required information. | diff --git a/ucp/reference/install.md b/ucp/reference/install.md index 76d8e1a2ee1..5bc41d35847 100644 --- a/ucp/reference/install.md +++ b/ucp/reference/install.md @@ -52,7 +52,7 @@ mounting the file at '/docker_subscription.lic' in the tool. E.g. | `--admin-password` | Specify the UCP admin password [$UCP_ADMIN_PASSWORD] | | `--fresh-install` | Destroy any existing state and start fresh. | | `--san` `[--san option --san option]` | Additional Subject Alternative Names for certs (e.g. `--san foo1.bar.com --san foo2.bar.com`). | -| `--host-address` | Specify the visible IP for this node. | +| `--host-address` | Specify the visible IP for this node. | | `--swarm-port "2376"` | Select what port to run the local Swarm manager on (default: 2376) | | `--controller-port "443"` | Select what port to run the local Controller on (default: 443) | | `--dns` `[--dns option --dns option]` | Set custom DNS servers for the UCP infrastructure containers. | diff --git a/ucp/reference/restore.md b/ucp/reference/restore.md index 8af06976883..f4d5af5efb7 100644 --- a/ucp/reference/restore.md +++ b/ucp/reference/restore.md @@ -41,11 +41,11 @@ must be provided. ## Options -| Option | Description | -|:-----------------|:-------------------------------------------------------------------------------------------------------| -| `--debug, -D` | Enable debug mode | -| `--jsonlog` | Produce json formatted output for easier parsing | -| `--id` | The ID of the UCP instance to backup | -| `--root-ca-only` | Restore only the root CA certificates and keys on this controller node (leaving all other data intact) | -| `--passphrase` | Decrypt the tar file with the provided passphrase [$UCP_PASSPHRASE] | -| `--interactive, -i` | Enable interactive mode. You will be prompted to enter all required information. | +| Option | Description | +|:--------------------|:-------------------------------------------------------------------------------------------------------| +| `--debug, -D` | Enable debug mode | +| `--jsonlog` | Produce json formatted output for easier parsing | +| `--id` | The ID of the UCP instance to backup | +| `--root-ca-only` | Restore only the root CA certificates and keys on this controller node (leaving all other data intact) | +| `--passphrase` | Decrypt the tar file with the provided passphrase [$UCP_PASSPHRASE] | +| `--interactive, -i` | Enable interactive mode. You will be prompted to enter all required information. | diff --git a/ucp/reference/upgrade.md b/ucp/reference/upgrade.md index f82a2a7a5a0..b1abb8d9e72 100644 --- a/ucp/reference/upgrade.md +++ b/ucp/reference/upgrade.md @@ -38,9 +38,9 @@ before proceeding to the next node. | Option | Description | |:----------------------|:----------------------------------------------------------------------------------------| -| `--debug, -D` | Enable debug | -| `--jsonlog` | Produce json formatted output for easier parsing | -| `--interactive, -i` | Enable interactive mode.,You will be prompted to enter all required information | +| `--debug, -D` | Enable debug | +| `--jsonlog` | Produce json formatted output for easier parsing | +| `--interactive, -i` | Enable interactive mode.,You will be prompted to enter all required information | | `--admin-username` | Specify the UCP admin username [$UCP_ADMIN_USER] | | `--admin-password` | Specify the UCP admin password [$UCP_ADMIN_PASSWORD] | | `--registry-username` | Specify the username to pull required images with [$REGISTRY_USERNAME] |