From 91b8ba2faefda10fa52b6081b2cb3d572ed0469d Mon Sep 17 00:00:00 2001 From: Hayahito Kawamitsu Date: Fri, 6 Apr 2018 18:41:09 +0900 Subject: [PATCH 1/3] add pipework catalog --- infra-templates/pipework/0/README.md | 30 ++++++++++++++++++ infra-templates/pipework/0/docker-compose.yml | 19 +++++++++++ .../pipework/0/rancher-compose.yml | 11 +++++++ .../pipework/catalogIcon-pipework.png | Bin 0 -> 26131 bytes infra-templates/pipework/config.yml | 7 ++++ 5 files changed, 67 insertions(+) create mode 100644 infra-templates/pipework/0/README.md create mode 100644 infra-templates/pipework/0/docker-compose.yml create mode 100644 infra-templates/pipework/0/rancher-compose.yml create mode 100644 infra-templates/pipework/catalogIcon-pipework.png create mode 100644 infra-templates/pipework/config.yml diff --git a/infra-templates/pipework/0/README.md b/infra-templates/pipework/0/README.md new file mode 100644 index 0000000..5f893ce --- /dev/null +++ b/infra-templates/pipework/0/README.md @@ -0,0 +1,30 @@ +# Pipework + +*Software-Defined Networking for Linux Containers* + +## Description + +* GitHub: [jpetazzo/pipework](https://github.com/jpetazzo/pipework) +* Docker Hub: [dreamcat4/pipework](https://hub.docker.com/r/dreamcat4/pipework/) + +By this catalog, to configure more flexible container network is available. +Good example of this, there is multiple container networks. + +## Deployment + +1. Select the template from the catalog. +2. Click `Launch`. + +## Usage + +To deploy a container having two NICs as an example, deploy it by the following steps. + +1. Create *Stack*. + * Already created *Stack* is available. +2. Create *Service*. + * Already created *Service* is available. +3. Set *Environment*. + * pipework_cmd_0: eth0 -i eth0 @CONTAINER_NAME@ 192.168.1.101/24 02:42:c0:a8:01:65@100 + * pipework_cmd_1: eth1 -i eth0 @CONTAINER_NAME@ 192.168.2.101/24 02:42:c0:a8:02:65@200 + +You can see the more details from [dreamcat4/pipework](https://github.com/dreamcat4/docker-images/tree/master/pipework). \ No newline at end of file diff --git a/infra-templates/pipework/0/docker-compose.yml b/infra-templates/pipework/0/docker-compose.yml new file mode 100644 index 0000000..6d39d98 --- /dev/null +++ b/infra-templates/pipework/0/docker-compose.yml @@ -0,0 +1,19 @@ +version: '2' +services: + pipework: + privileged: true + image: dreamcat4/pipework:1.1.6 + stdin_open: true + network_mode: host + volumes: + - /var/run/docker.sock:/docker.sock + tty: true + pid: host + environment: + run_mode: batch,daemon + labels: + io.rancher.container.pull_image: always + io.rancher.container.hostname_override: container_name + io.rancher.container.agent.role: environmentAdmin + io.rancher.container.create_agent: 'true' + io.rancher.scheduler.global: 'true' \ No newline at end of file diff --git a/infra-templates/pipework/0/rancher-compose.yml b/infra-templates/pipework/0/rancher-compose.yml new file mode 100644 index 0000000..83090af --- /dev/null +++ b/infra-templates/pipework/0/rancher-compose.yml @@ -0,0 +1,11 @@ +.catalog: + name: "Pipework" + description: | + "Software-Defined Networking for Linux Containers" + version: v0.1.0 + minimum_rancher_version: v1.6.10 + maintainer: "Hayahito Kawamitsu " +version: '2' +services: + pipework: + start_on_create: true diff --git a/infra-templates/pipework/catalogIcon-pipework.png b/infra-templates/pipework/catalogIcon-pipework.png new file mode 100644 index 0000000000000000000000000000000000000000..cbd00e304dfb95ddc06fdbeccf669e7270b65963 GIT binary patch literal 26131 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 Date: Mon, 9 Apr 2018 15:24:26 +0900 Subject: [PATCH 2/3] remove maintainer from pipework --- infra-templates/pipework/0/rancher-compose.yml | 1 - infra-templates/pipework/config.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/infra-templates/pipework/0/rancher-compose.yml b/infra-templates/pipework/0/rancher-compose.yml index 83090af..bfc2188 100644 --- a/infra-templates/pipework/0/rancher-compose.yml +++ b/infra-templates/pipework/0/rancher-compose.yml @@ -4,7 +4,6 @@ "Software-Defined Networking for Linux Containers" version: v0.1.0 minimum_rancher_version: v1.6.10 - maintainer: "Hayahito Kawamitsu " version: '2' services: pipework: diff --git a/infra-templates/pipework/config.yml b/infra-templates/pipework/config.yml index e8f5cb5..9fe0107 100644 --- a/infra-templates/pipework/config.yml +++ b/infra-templates/pipework/config.yml @@ -3,5 +3,4 @@ description: | Software-Defined Networking for Linux Containers version: v0.1.0 category: Network -maintainer: community license: From 59326911a686b59f8e3f050e902b14c369b50ab5 Mon Sep 17 00:00:00 2001 From: Hayahito Kawamitsu Date: Wed, 11 Apr 2018 00:44:22 +0900 Subject: [PATCH 3/3] fix compose format and misspell in pipework catalog --- infra-templates/pipework/0/README.md | 2 +- infra-templates/pipework/0/docker-compose.yml | 1 - infra-templates/pipework/0/rancher-compose.yml | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/infra-templates/pipework/0/README.md b/infra-templates/pipework/0/README.md index 5f893ce..180bff2 100644 --- a/infra-templates/pipework/0/README.md +++ b/infra-templates/pipework/0/README.md @@ -8,7 +8,7 @@ * Docker Hub: [dreamcat4/pipework](https://hub.docker.com/r/dreamcat4/pipework/) By this catalog, to configure more flexible container network is available. -Good example of this, there is multiple container networks. +A good example of this, there is multiple container networks. ## Deployment diff --git a/infra-templates/pipework/0/docker-compose.yml b/infra-templates/pipework/0/docker-compose.yml index 6d39d98..37557d7 100644 --- a/infra-templates/pipework/0/docker-compose.yml +++ b/infra-templates/pipework/0/docker-compose.yml @@ -12,7 +12,6 @@ services: environment: run_mode: batch,daemon labels: - io.rancher.container.pull_image: always io.rancher.container.hostname_override: container_name io.rancher.container.agent.role: environmentAdmin io.rancher.container.create_agent: 'true' diff --git a/infra-templates/pipework/0/rancher-compose.yml b/infra-templates/pipework/0/rancher-compose.yml index bfc2188..403010a 100644 --- a/infra-templates/pipework/0/rancher-compose.yml +++ b/infra-templates/pipework/0/rancher-compose.yml @@ -1,10 +1,10 @@ -.catalog: +version: '2' +catalog: name: "Pipework" description: | "Software-Defined Networking for Linux Containers" version: v0.1.0 minimum_rancher_version: v1.6.10 -version: '2' services: pipework: start_on_create: true