From 24f4ad1f256baa5c6bbd73e07f933141449f3ffd Mon Sep 17 00:00:00 2001 From: Sebastien Langoureaux Date: Tue, 7 Feb 2017 15:02:45 +0100 Subject: [PATCH] Get automatically the ranger api access --- templates/rancher-backup/0/README.md | 4 ---- templates/rancher-backup/0/docker-compose.yml | 7 +++---- templates/rancher-backup/0/rancher-compose.yml | 15 --------------- templates/rancher-backup/config.yml | 2 +- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/templates/rancher-backup/0/README.md b/templates/rancher-backup/0/README.md index 318dd24..2802a26 100644 --- a/templates/rancher-backup/0/README.md +++ b/templates/rancher-backup/0/README.md @@ -26,10 +26,6 @@ For the moment, this template permit to perform the following actions: > Note: you can read [the duplicity documentation](http://duplicity.nongnu.org/duplicity.1.html) about backup policy -You must add your Rancher environment credential in environments variables to auto discover: -- `RANCHER_API_URL`: the API URL with your project ID -- `RANCHER_API_KEY`: the API key -- `RANCHER_API_SECRET`: the API secret key The currents backends supported by duplicity are FTP, Azure, B2, Cloud Files, Dropbox, FISH, Google Docs, Google Cloud Storage, HSI, Hubbic, Mega cloud storage, OneDrive backend, Par2 Wrapper Backend, S3 storage, Swift and MediaFire diff --git a/templates/rancher-backup/0/docker-compose.yml b/templates/rancher-backup/0/docker-compose.yml index 70ce769..b22a784 100644 --- a/templates/rancher-backup/0/docker-compose.yml +++ b/templates/rancher-backup/0/docker-compose.yml @@ -7,9 +7,6 @@ backup: BK_KEEP_FULL: ${BK_KEEP_FULL} BK_KEEP_FULL_CHAIN: ${BK_KEEP_FULL_CHAIN} VOLUME_SIZE: ${VOLUME_SIZE} - RANCHER_API_URL: ${RANCHER_API_URL} - RANCHER_API_KEY: ${RANCHER_API_KEY} - RANCHER_API_SECRET: ${RANCHER_API_SECRET} DEBUG: false DISABLE_DUMP : ${DISABLE_DUMP} DISABLE_DUMP_RANCHER: ${DISABLE_DUMP_RANCHER} @@ -29,8 +26,10 @@ backup: SWIFT_AUTHURL: ${SWIFT_AUTHURL} labels: io.rancher.sidekicks: backup-data + io.rancher.container.create_agent: true + io.rancher.container.agent.role: environment tty: true - image: webcenter/rancher-backup:1.0.1 + image: webcenter/rancher-backup:1.0.2 stdin_open: false privileged: true volumes_from: diff --git a/templates/rancher-backup/0/rancher-compose.yml b/templates/rancher-backup/0/rancher-compose.yml index f399994..1275a7d 100644 --- a/templates/rancher-backup/0/rancher-compose.yml +++ b/templates/rancher-backup/0/rancher-compose.yml @@ -66,21 +66,6 @@ options: - "false" - "true" - - variable: RANCHER_API_URL - description: "The Rancher API URL with project ID" - label: "Rancher API URL" - type: "string" - required: true - - variable: RANCHER_API_KEY - description: "The Rancher API key" - label: "Rancher API key" - type: "password" - required: true - - variable: RANCHER_API_SECRET - description: "The Rancher API secret key" - label: "Rancher API secret" - type: "password" - required: true - variable: FTP_PASSWORD label: "FTP password" type: "password" diff --git a/templates/rancher-backup/config.yml b/templates/rancher-backup/config.yml index 9ab58ce..8c5aa70 100644 --- a/templates/rancher-backup/config.yml +++ b/templates/rancher-backup/config.yml @@ -1,5 +1,5 @@ name: Rancher Backup description: | It's a general purpose to solve backup matter on Rancher. -version: 1.0.1 +version: 1.0.2 category: Backup