From 2abb18af1a7d4854a5b7f4d7fee5ff6ce349a602 Mon Sep 17 00:00:00 2001 From: Charlie Drage Date: Mon, 3 Apr 2017 14:50:52 -0400 Subject: [PATCH] Fix the examples Moves `docker-compose.yaml` to `docker-compose-counter.yaml` and replaces the default docker-compose.yaml with the example from the Kompose.io website. We also rename each file from yml to yaml. As well as do some slight modifications / formatting to docker-compose-bundle.dab --- examples/docker-compose-bundle.dab | 2 +- examples/{docker-compose.yml => docker-compose-counter.yaml} | 0 examples/{docker-guestbook.yml => docker-compose.yaml} | 5 +++++ examples/{docker-gitlab.yml => docker-gitlab.yaml} | 0 examples/{docker-voting.yml => docker-voting.yaml} | 0 5 files changed, 6 insertions(+), 1 deletion(-) rename examples/{docker-compose.yml => docker-compose-counter.yaml} (100%) rename examples/{docker-guestbook.yml => docker-compose.yaml} (87%) rename examples/{docker-gitlab.yml => docker-gitlab.yaml} (100%) rename examples/{docker-voting.yml => docker-voting.yaml} (100%) diff --git a/examples/docker-compose-bundle.dab b/examples/docker-compose-bundle.dab index 3a7e4e30..297088d0 100644 --- a/examples/docker-compose-bundle.dab +++ b/examples/docker-compose-bundle.dab @@ -22,4 +22,4 @@ } }, "version": "0.1" -} \ No newline at end of file +} diff --git a/examples/docker-compose.yml b/examples/docker-compose-counter.yaml similarity index 100% rename from examples/docker-compose.yml rename to examples/docker-compose-counter.yaml diff --git a/examples/docker-guestbook.yml b/examples/docker-compose.yaml similarity index 87% rename from examples/docker-guestbook.yml rename to examples/docker-compose.yaml index 0918c6fd..5f847a4f 100644 --- a/examples/docker-guestbook.yml +++ b/examples/docker-compose.yaml @@ -1,19 +1,24 @@ version: "2" services: + redis-master: image: gcr.io/google_containers/redis:e2e ports: - "6379" + redis-slave: image: gcr.io/google_samples/gb-redisslave:v1 ports: - "6379" environment: - GET_HOSTS_FROM=dns + frontend: image: gcr.io/google-samples/gb-frontend:v4 ports: - "80:80" environment: - GET_HOSTS_FROM=dns + labels: + kompose.service.type: LoadBalancer diff --git a/examples/docker-gitlab.yml b/examples/docker-gitlab.yaml similarity index 100% rename from examples/docker-gitlab.yml rename to examples/docker-gitlab.yaml diff --git a/examples/docker-voting.yml b/examples/docker-voting.yaml similarity index 100% rename from examples/docker-voting.yml rename to examples/docker-voting.yaml