From d4f79a8deee7c37a442974490d7e1d8d336e4bd8 Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Mon, 18 Apr 2022 13:58:16 -0400 Subject: [PATCH 01/10] New layerfiles --- .layerfiles/cypress/Layerfile | 5 ----- {.layerfiles => Layerfiles}/base/Layerfile | 0 Layerfiles/test_1/Layerfile | 3 +++ Layerfiles/test_2/Layerfile | 3 +++ Layerfiles/test_3/Layerfile | 3 +++ Layerfiles/test_4/Layerfile | 3 +++ 6 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 .layerfiles/cypress/Layerfile rename {.layerfiles => Layerfiles}/base/Layerfile (100%) create mode 100644 Layerfiles/test_1/Layerfile create mode 100644 Layerfiles/test_2/Layerfile create mode 100644 Layerfiles/test_3/Layerfile create mode 100644 Layerfiles/test_4/Layerfile diff --git a/.layerfiles/cypress/Layerfile b/.layerfiles/cypress/Layerfile deleted file mode 100644 index 2abe7ff..0000000 --- a/.layerfiles/cypress/Layerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM ../base - -RUN curl http://localhost:8080 - -RUN docker run -it --add-host host.docker.internal:host-gateway -v $PWD:/e2e -w /e2e cypress/included:3.2.0 diff --git a/.layerfiles/base/Layerfile b/Layerfiles/base/Layerfile similarity index 100% rename from .layerfiles/base/Layerfile rename to Layerfiles/base/Layerfile diff --git a/Layerfiles/test_1/Layerfile b/Layerfiles/test_1/Layerfile new file mode 100644 index 0000000..0e8c8c0 --- /dev/null +++ b/Layerfiles/test_1/Layerfile @@ -0,0 +1,3 @@ +FROM ./base + +RUN echo hello 1 diff --git a/Layerfiles/test_2/Layerfile b/Layerfiles/test_2/Layerfile new file mode 100644 index 0000000..d2c0f89 --- /dev/null +++ b/Layerfiles/test_2/Layerfile @@ -0,0 +1,3 @@ +FROM ./base + +RUN echo hello 2 diff --git a/Layerfiles/test_3/Layerfile b/Layerfiles/test_3/Layerfile new file mode 100644 index 0000000..411cb84 --- /dev/null +++ b/Layerfiles/test_3/Layerfile @@ -0,0 +1,3 @@ +FROM ./base + +RUN echo hello 3 diff --git a/Layerfiles/test_4/Layerfile b/Layerfiles/test_4/Layerfile new file mode 100644 index 0000000..53b3654 --- /dev/null +++ b/Layerfiles/test_4/Layerfile @@ -0,0 +1,3 @@ +FROM ./base + +RUN echo hello 4 From 946eef96c49eeb18be60955a277441e03862e2c9 Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Mon, 18 Apr 2022 14:03:54 -0400 Subject: [PATCH 02/10] From --- Layerfiles/test_1/Layerfile | 2 +- Layerfiles/test_2/Layerfile | 2 +- Layerfiles/test_3/Layerfile | 2 +- Layerfiles/test_4/Layerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Layerfiles/test_1/Layerfile b/Layerfiles/test_1/Layerfile index 0e8c8c0..069a5cb 100644 --- a/Layerfiles/test_1/Layerfile +++ b/Layerfiles/test_1/Layerfile @@ -1,3 +1,3 @@ -FROM ./base +FROM ../base RUN echo hello 1 diff --git a/Layerfiles/test_2/Layerfile b/Layerfiles/test_2/Layerfile index d2c0f89..ff75750 100644 --- a/Layerfiles/test_2/Layerfile +++ b/Layerfiles/test_2/Layerfile @@ -1,3 +1,3 @@ -FROM ./base +FROM ../base RUN echo hello 2 diff --git a/Layerfiles/test_3/Layerfile b/Layerfiles/test_3/Layerfile index 411cb84..f909c87 100644 --- a/Layerfiles/test_3/Layerfile +++ b/Layerfiles/test_3/Layerfile @@ -1,3 +1,3 @@ -FROM ./base +FROM ../base RUN echo hello 3 diff --git a/Layerfiles/test_4/Layerfile b/Layerfiles/test_4/Layerfile index 53b3654..b47f51a 100644 --- a/Layerfiles/test_4/Layerfile +++ b/Layerfiles/test_4/Layerfile @@ -1,3 +1,3 @@ -FROM ./base +FROM ../base RUN echo hello 4 From 29f7f86bca2608f495bcd9c5a97495e668598f1f Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Mon, 18 Apr 2022 14:41:10 -0400 Subject: [PATCH 03/10] labels --- Layerfiles/test_1/Layerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Layerfiles/test_1/Layerfile b/Layerfiles/test_1/Layerfile index 069a5cb..a5a074d 100644 --- a/Layerfiles/test_1/Layerfile +++ b/Layerfiles/test_1/Layerfile @@ -1,3 +1,6 @@ FROM ../base +LABEL display_name=test-1 +LABEL status=hidden + RUN echo hello 1 From 74641512f46a9c624b501716eb01708ef1e84617 Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Mon, 18 Apr 2022 14:42:23 -0400 Subject: [PATCH 04/10] move --- Layerfiles/cypress/Layerfile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Layerfiles/cypress/Layerfile diff --git a/Layerfiles/cypress/Layerfile b/Layerfiles/cypress/Layerfile new file mode 100644 index 0000000..2abe7ff --- /dev/null +++ b/Layerfiles/cypress/Layerfile @@ -0,0 +1,5 @@ +FROM ../base + +RUN curl http://localhost:8080 + +RUN docker run -it --add-host host.docker.internal:host-gateway -v $PWD:/e2e -w /e2e cypress/included:3.2.0 From d8e8950277dfa21762d80a54dd86b7be9a10172e Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Mon, 18 Apr 2022 15:03:40 -0400 Subject: [PATCH 05/10] Do not hide status --- Layerfiles/test_1/Layerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Layerfiles/test_1/Layerfile b/Layerfiles/test_1/Layerfile index a5a074d..6fbc650 100644 --- a/Layerfiles/test_1/Layerfile +++ b/Layerfiles/test_1/Layerfile @@ -1,6 +1,5 @@ FROM ../base -LABEL display_name=test-1 -LABEL status=hidden +LABEL display_name=test RUN echo hello 1 From a546c4c13399383ac8877ac6cecdf07c37a083f1 Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Mon, 18 Apr 2022 15:07:46 -0400 Subject: [PATCH 06/10] label --- Layerfiles/test_2/Layerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Layerfiles/test_2/Layerfile b/Layerfiles/test_2/Layerfile index ff75750..d7d9371 100644 --- a/Layerfiles/test_2/Layerfile +++ b/Layerfiles/test_2/Layerfile @@ -1,3 +1,5 @@ FROM ../base +LABEL display_name=test-2 + RUN echo hello 2 From 191d562ef8994221b5f794682e3aafdd6262a5de Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Mon, 18 Apr 2022 15:26:16 -0400 Subject: [PATCH 07/10] more layer --- Layerfiles/test_10/Layerfile | 5 +++++ Layerfiles/test_20/Layerfile | 5 +++++ Layerfiles/test_30/Layerfile | 3 +++ Layerfiles/test_40/Layerfile | 3 +++ 4 files changed, 16 insertions(+) create mode 100644 Layerfiles/test_10/Layerfile create mode 100644 Layerfiles/test_20/Layerfile create mode 100644 Layerfiles/test_30/Layerfile create mode 100644 Layerfiles/test_40/Layerfile diff --git a/Layerfiles/test_10/Layerfile b/Layerfiles/test_10/Layerfile new file mode 100644 index 0000000..6fbc650 --- /dev/null +++ b/Layerfiles/test_10/Layerfile @@ -0,0 +1,5 @@ +FROM ../base + +LABEL display_name=test + +RUN echo hello 1 diff --git a/Layerfiles/test_20/Layerfile b/Layerfiles/test_20/Layerfile new file mode 100644 index 0000000..d7d9371 --- /dev/null +++ b/Layerfiles/test_20/Layerfile @@ -0,0 +1,5 @@ +FROM ../base + +LABEL display_name=test-2 + +RUN echo hello 2 diff --git a/Layerfiles/test_30/Layerfile b/Layerfiles/test_30/Layerfile new file mode 100644 index 0000000..f909c87 --- /dev/null +++ b/Layerfiles/test_30/Layerfile @@ -0,0 +1,3 @@ +FROM ../base + +RUN echo hello 3 diff --git a/Layerfiles/test_40/Layerfile b/Layerfiles/test_40/Layerfile new file mode 100644 index 0000000..b47f51a --- /dev/null +++ b/Layerfiles/test_40/Layerfile @@ -0,0 +1,3 @@ +FROM ../base + +RUN echo hello 4 From 6fc15cc11488b9f22bd33fb197b255b57202790d Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Mon, 18 Apr 2022 15:32:49 -0400 Subject: [PATCH 08/10] no label --- Layerfiles/test_10/Layerfile | 2 -- Layerfiles/test_20/Layerfile | 2 -- 2 files changed, 4 deletions(-) diff --git a/Layerfiles/test_10/Layerfile b/Layerfiles/test_10/Layerfile index 6fbc650..069a5cb 100644 --- a/Layerfiles/test_10/Layerfile +++ b/Layerfiles/test_10/Layerfile @@ -1,5 +1,3 @@ FROM ../base -LABEL display_name=test - RUN echo hello 1 diff --git a/Layerfiles/test_20/Layerfile b/Layerfiles/test_20/Layerfile index d7d9371..ff75750 100644 --- a/Layerfiles/test_20/Layerfile +++ b/Layerfiles/test_20/Layerfile @@ -1,5 +1,3 @@ FROM ../base -LABEL display_name=test-2 - RUN echo hello 2 From 4fb5284b5bb64cfe35ff6041066d35afa46271b0 Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Tue, 19 Apr 2022 10:47:07 -0400 Subject: [PATCH 09/10] hide base --- Layerfiles/base/Layerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Layerfiles/base/Layerfile b/Layerfiles/base/Layerfile index 0f4f8dc..963c628 100644 --- a/Layerfiles/base/Layerfile +++ b/Layerfiles/base/Layerfile @@ -1,6 +1,8 @@ #This is an example LayerCI configuration for Docker! FROM vm/ubuntu:18.04 +LABEL status=hidden + # To note: Layerfiles create entire VMs, *not* containers! # install the latest version of Docker, as in the official Docker installation tutorial. From 45c85e471aa7942a354dde88a34e0962f4193099 Mon Sep 17 00:00:00 2001 From: Connor MacKenzie Date: Tue, 19 Apr 2022 10:48:15 -0400 Subject: [PATCH 10/10] display test --- Layerfiles/test_1/Layerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Layerfiles/test_1/Layerfile b/Layerfiles/test_1/Layerfile index 6fbc650..87e86cc 100644 --- a/Layerfiles/test_1/Layerfile +++ b/Layerfiles/test_1/Layerfile @@ -1,5 +1,7 @@ FROM ../base +LABEL status=display + LABEL display_name=test RUN echo hello 1