From 153e7c1e1180cfe1c4563bdc1f794afe8a946cf6 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Thu, 7 May 2020 09:35:25 +0200 Subject: [PATCH] Moved sample compose files in test folder --- tests/aci-e2e/e2e-aci.go | 4 ++-- .../composefiles}/aci-demo/aci_demo_port.yaml | 0 .../aci-demo/aci_demo_port_secrets.yaml | 0 .../aci-demo/aci_demo_port_secrets_volumes.yaml | 0 .../composefiles}/aci-demo/db/Dockerfile | 0 .../composefiles}/aci-demo/db/words.sql | 0 .../aci-demo/img/dockercon-barcelona-logo.svg | 0 .../composefiles}/aci-demo/img/dockercon_EU_17.jpg | Bin .../composefiles}/aci-demo/my_secret1.txt | 0 .../composefiles}/aci-demo/my_secret2.txt | 0 .../composefiles}/aci-demo/web/Dockerfile | 0 .../composefiles}/aci-demo/web/dispatcher.go | 0 .../aci-demo/web/static/angular.min.js | 0 .../composefiles}/aci-demo/web/static/app.js | 0 .../composefiles}/aci-demo/web/static/favicon.ico | Bin .../aci-demo/web/static/fonts/font1.woff2 | Bin .../aci-demo/web/static/fonts/font2.woff2 | Bin .../aci-demo/web/static/images/dockercon-log.png | Bin .../aci-demo/web/static/images/homes.png | Bin .../aci-demo/web/static/images/lego_blue.png | Bin .../aci-demo/web/static/images/lego_light_blue.png | Bin .../aci-demo/web/static/images/lego_yellow.png | Bin .../aci-demo/web/static/images/logo.svg | 0 .../composefiles}/aci-demo/web/static/index.html | 0 .../composefiles}/aci-demo/web/static/style.css | 0 .../composefiles}/aci-demo/words/.dockerignore | 0 .../composefiles}/aci-demo/words/Dockerfile | 0 .../composefiles}/aci-demo/words/pom.xml | 0 .../aci-demo/words/src/main/java/Main.java | 0 {composefiles => tests/composefiles}/nginx.yaml | 0 30 files changed, 2 insertions(+), 2 deletions(-) rename {composefiles => tests/composefiles}/aci-demo/aci_demo_port.yaml (100%) rename {composefiles => tests/composefiles}/aci-demo/aci_demo_port_secrets.yaml (100%) rename {composefiles => tests/composefiles}/aci-demo/aci_demo_port_secrets_volumes.yaml (100%) rename {composefiles => tests/composefiles}/aci-demo/db/Dockerfile (100%) rename {composefiles => tests/composefiles}/aci-demo/db/words.sql (100%) rename {composefiles => tests/composefiles}/aci-demo/img/dockercon-barcelona-logo.svg (100%) rename {composefiles => tests/composefiles}/aci-demo/img/dockercon_EU_17.jpg (100%) rename {composefiles => tests/composefiles}/aci-demo/my_secret1.txt (100%) rename {composefiles => tests/composefiles}/aci-demo/my_secret2.txt (100%) rename {composefiles => tests/composefiles}/aci-demo/web/Dockerfile (100%) rename {composefiles => tests/composefiles}/aci-demo/web/dispatcher.go (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/angular.min.js (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/app.js (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/favicon.ico (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/fonts/font1.woff2 (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/fonts/font2.woff2 (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/images/dockercon-log.png (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/images/homes.png (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/images/lego_blue.png (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/images/lego_light_blue.png (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/images/lego_yellow.png (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/images/logo.svg (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/index.html (100%) rename {composefiles => tests/composefiles}/aci-demo/web/static/style.css (100%) rename {composefiles => tests/composefiles}/aci-demo/words/.dockerignore (100%) rename {composefiles => tests/composefiles}/aci-demo/words/Dockerfile (100%) rename {composefiles => tests/composefiles}/aci-demo/words/pom.xml (100%) rename {composefiles => tests/composefiles}/aci-demo/words/src/main/java/Main.java (100%) rename {composefiles => tests/composefiles}/nginx.yaml (100%) diff --git a/tests/aci-e2e/e2e-aci.go b/tests/aci-e2e/e2e-aci.go index 7d7975a7..0f45688e 100644 --- a/tests/aci-e2e/e2e-aci.go +++ b/tests/aci-e2e/e2e-aci.go @@ -89,7 +89,7 @@ func main() { */ It("deploys a compose app", func() { - NewDockerCommand("compose", "up", "-f", "./composefiles/aci-demo/aci_demo_port.yaml", "--name", "acidemo").ExecOrDie() + NewDockerCommand("compose", "up", "-f", "./tests/composefiles/aci-demo/aci_demo_port.yaml", "--name", "acidemo").ExecOrDie() //Expect(output).To(ContainSubstring("Successfully deployed")) output := NewDockerCommand("ps").ExecOrDie() Lines := Lines(output) @@ -121,7 +121,7 @@ func main() { }) It("shutdown compose app", func() { - NewDockerCommand("compose", "down", "-f", "./composefiles/aci-demo/aci_demo_port.yaml", "--name", "acidemo").ExecOrDie() + NewDockerCommand("compose", "down", "-f", "./tests/composefiles/aci-demo/aci_demo_port.yaml", "--name", "acidemo").ExecOrDie() }) It("switches back to default context", func() { output := NewCommand("docker", "context", "use", "default").ExecOrDie() diff --git a/composefiles/aci-demo/aci_demo_port.yaml b/tests/composefiles/aci-demo/aci_demo_port.yaml similarity index 100% rename from composefiles/aci-demo/aci_demo_port.yaml rename to tests/composefiles/aci-demo/aci_demo_port.yaml diff --git a/composefiles/aci-demo/aci_demo_port_secrets.yaml b/tests/composefiles/aci-demo/aci_demo_port_secrets.yaml similarity index 100% rename from composefiles/aci-demo/aci_demo_port_secrets.yaml rename to tests/composefiles/aci-demo/aci_demo_port_secrets.yaml diff --git a/composefiles/aci-demo/aci_demo_port_secrets_volumes.yaml b/tests/composefiles/aci-demo/aci_demo_port_secrets_volumes.yaml similarity index 100% rename from composefiles/aci-demo/aci_demo_port_secrets_volumes.yaml rename to tests/composefiles/aci-demo/aci_demo_port_secrets_volumes.yaml diff --git a/composefiles/aci-demo/db/Dockerfile b/tests/composefiles/aci-demo/db/Dockerfile similarity index 100% rename from composefiles/aci-demo/db/Dockerfile rename to tests/composefiles/aci-demo/db/Dockerfile diff --git a/composefiles/aci-demo/db/words.sql b/tests/composefiles/aci-demo/db/words.sql similarity index 100% rename from composefiles/aci-demo/db/words.sql rename to tests/composefiles/aci-demo/db/words.sql diff --git a/composefiles/aci-demo/img/dockercon-barcelona-logo.svg b/tests/composefiles/aci-demo/img/dockercon-barcelona-logo.svg similarity index 100% rename from composefiles/aci-demo/img/dockercon-barcelona-logo.svg rename to tests/composefiles/aci-demo/img/dockercon-barcelona-logo.svg diff --git a/composefiles/aci-demo/img/dockercon_EU_17.jpg b/tests/composefiles/aci-demo/img/dockercon_EU_17.jpg similarity index 100% rename from composefiles/aci-demo/img/dockercon_EU_17.jpg rename to tests/composefiles/aci-demo/img/dockercon_EU_17.jpg diff --git a/composefiles/aci-demo/my_secret1.txt b/tests/composefiles/aci-demo/my_secret1.txt similarity index 100% rename from composefiles/aci-demo/my_secret1.txt rename to tests/composefiles/aci-demo/my_secret1.txt diff --git a/composefiles/aci-demo/my_secret2.txt b/tests/composefiles/aci-demo/my_secret2.txt similarity index 100% rename from composefiles/aci-demo/my_secret2.txt rename to tests/composefiles/aci-demo/my_secret2.txt diff --git a/composefiles/aci-demo/web/Dockerfile b/tests/composefiles/aci-demo/web/Dockerfile similarity index 100% rename from composefiles/aci-demo/web/Dockerfile rename to tests/composefiles/aci-demo/web/Dockerfile diff --git a/composefiles/aci-demo/web/dispatcher.go b/tests/composefiles/aci-demo/web/dispatcher.go similarity index 100% rename from composefiles/aci-demo/web/dispatcher.go rename to tests/composefiles/aci-demo/web/dispatcher.go diff --git a/composefiles/aci-demo/web/static/angular.min.js b/tests/composefiles/aci-demo/web/static/angular.min.js similarity index 100% rename from composefiles/aci-demo/web/static/angular.min.js rename to tests/composefiles/aci-demo/web/static/angular.min.js diff --git a/composefiles/aci-demo/web/static/app.js b/tests/composefiles/aci-demo/web/static/app.js similarity index 100% rename from composefiles/aci-demo/web/static/app.js rename to tests/composefiles/aci-demo/web/static/app.js diff --git a/composefiles/aci-demo/web/static/favicon.ico b/tests/composefiles/aci-demo/web/static/favicon.ico similarity index 100% rename from composefiles/aci-demo/web/static/favicon.ico rename to tests/composefiles/aci-demo/web/static/favicon.ico diff --git a/composefiles/aci-demo/web/static/fonts/font1.woff2 b/tests/composefiles/aci-demo/web/static/fonts/font1.woff2 similarity index 100% rename from composefiles/aci-demo/web/static/fonts/font1.woff2 rename to tests/composefiles/aci-demo/web/static/fonts/font1.woff2 diff --git a/composefiles/aci-demo/web/static/fonts/font2.woff2 b/tests/composefiles/aci-demo/web/static/fonts/font2.woff2 similarity index 100% rename from composefiles/aci-demo/web/static/fonts/font2.woff2 rename to tests/composefiles/aci-demo/web/static/fonts/font2.woff2 diff --git a/composefiles/aci-demo/web/static/images/dockercon-log.png b/tests/composefiles/aci-demo/web/static/images/dockercon-log.png similarity index 100% rename from composefiles/aci-demo/web/static/images/dockercon-log.png rename to tests/composefiles/aci-demo/web/static/images/dockercon-log.png diff --git a/composefiles/aci-demo/web/static/images/homes.png b/tests/composefiles/aci-demo/web/static/images/homes.png similarity index 100% rename from composefiles/aci-demo/web/static/images/homes.png rename to tests/composefiles/aci-demo/web/static/images/homes.png diff --git a/composefiles/aci-demo/web/static/images/lego_blue.png b/tests/composefiles/aci-demo/web/static/images/lego_blue.png similarity index 100% rename from composefiles/aci-demo/web/static/images/lego_blue.png rename to tests/composefiles/aci-demo/web/static/images/lego_blue.png diff --git a/composefiles/aci-demo/web/static/images/lego_light_blue.png b/tests/composefiles/aci-demo/web/static/images/lego_light_blue.png similarity index 100% rename from composefiles/aci-demo/web/static/images/lego_light_blue.png rename to tests/composefiles/aci-demo/web/static/images/lego_light_blue.png diff --git a/composefiles/aci-demo/web/static/images/lego_yellow.png b/tests/composefiles/aci-demo/web/static/images/lego_yellow.png similarity index 100% rename from composefiles/aci-demo/web/static/images/lego_yellow.png rename to tests/composefiles/aci-demo/web/static/images/lego_yellow.png diff --git a/composefiles/aci-demo/web/static/images/logo.svg b/tests/composefiles/aci-demo/web/static/images/logo.svg similarity index 100% rename from composefiles/aci-demo/web/static/images/logo.svg rename to tests/composefiles/aci-demo/web/static/images/logo.svg diff --git a/composefiles/aci-demo/web/static/index.html b/tests/composefiles/aci-demo/web/static/index.html similarity index 100% rename from composefiles/aci-demo/web/static/index.html rename to tests/composefiles/aci-demo/web/static/index.html diff --git a/composefiles/aci-demo/web/static/style.css b/tests/composefiles/aci-demo/web/static/style.css similarity index 100% rename from composefiles/aci-demo/web/static/style.css rename to tests/composefiles/aci-demo/web/static/style.css diff --git a/composefiles/aci-demo/words/.dockerignore b/tests/composefiles/aci-demo/words/.dockerignore similarity index 100% rename from composefiles/aci-demo/words/.dockerignore rename to tests/composefiles/aci-demo/words/.dockerignore diff --git a/composefiles/aci-demo/words/Dockerfile b/tests/composefiles/aci-demo/words/Dockerfile similarity index 100% rename from composefiles/aci-demo/words/Dockerfile rename to tests/composefiles/aci-demo/words/Dockerfile diff --git a/composefiles/aci-demo/words/pom.xml b/tests/composefiles/aci-demo/words/pom.xml similarity index 100% rename from composefiles/aci-demo/words/pom.xml rename to tests/composefiles/aci-demo/words/pom.xml diff --git a/composefiles/aci-demo/words/src/main/java/Main.java b/tests/composefiles/aci-demo/words/src/main/java/Main.java similarity index 100% rename from composefiles/aci-demo/words/src/main/java/Main.java rename to tests/composefiles/aci-demo/words/src/main/java/Main.java diff --git a/composefiles/nginx.yaml b/tests/composefiles/nginx.yaml similarity index 100% rename from composefiles/nginx.yaml rename to tests/composefiles/nginx.yaml