From 136e1c38b3d5388b57dade3a79f112b5b9246b61 Mon Sep 17 00:00:00 2001 From: Vick Ahuja <69281942+vvickedvveb@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:24:15 -0400 Subject: [PATCH 1/9] Update main.css --- services/web/src/views/main/main.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/web/src/views/main/main.css b/services/web/src/views/main/main.css index 1c45a11..6162e5e 100644 --- a/services/web/src/views/main/main.css +++ b/services/web/src/views/main/main.css @@ -16,11 +16,11 @@ body { } .mainBody header { - background: #0c5db8; + background: green; } .mainBody .sidebar { - background: #1c4784; + background: purple; height: auto; flex: 0 0 200px; } @@ -88,4 +88,4 @@ header { background: #fff; border-radius: 5px; border: 1px solid #000; -} \ No newline at end of file +} From 6e17b179216486e10fef8fda9dd30d2beaf8b6b4 Mon Sep 17 00:00:00 2001 From: Vick Ahuja <69281942+vvickedvveb@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:25:10 -0400 Subject: [PATCH 2/9] Update main.css --- services/web/src/views/main/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/src/views/main/main.css b/services/web/src/views/main/main.css index 6162e5e..7ba90a3 100644 --- a/services/web/src/views/main/main.css +++ b/services/web/src/views/main/main.css @@ -16,11 +16,11 @@ body { } .mainBody header { - background: green; + background: pink; } .mainBody .sidebar { - background: purple; + background: red; height: auto; flex: 0 0 200px; } From 251659008c73b69f816421a9766b436e5fea9356 Mon Sep 17 00:00:00 2001 From: Vick Ahuja <69281942+vvickedvveb@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:34:34 -0400 Subject: [PATCH 3/9] Update Layerfile --- Layerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Layerfile b/Layerfile index f2eb7e1..37409d9 100644 --- a/Layerfile +++ b/Layerfile @@ -19,3 +19,4 @@ RUN REPEATABLE docker-compose up -d --build --force-recreate --remove-orphans && EXPOSE WEBSITE localhost:8000 +RUN docker-compose exec cypress bash /app/run_tests.sh From 257280b15493cea3ffbcf846b9a0fe6ce23b812c Mon Sep 17 00:00:00 2001 From: Vick Ahuja <69281942+vvickedvveb@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:42:13 -0400 Subject: [PATCH 4/9] Update Layerfile --- Layerfile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Layerfile b/Layerfile index 37409d9..c86c8f2 100644 --- a/Layerfile +++ b/Layerfile @@ -17,6 +17,23 @@ COPY / /root RUN REPEATABLE docker-compose up -d --build --force-recreate --remove-orphans && sleep 6 -EXPOSE WEBSITE localhost:8000 + +FROM ubuntu:18.04 +RUN apt-get update && \ + apt-get install gcc g++ make libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 \ + systemd libnss3 libxss1 libasound2 libxtst6 xauth xvfb curl -y +RUN curl -fSsL https://deb.nodesource.com/setup_12.x | bash +RUN apt-get install nodejs -y +RUN npm install -g cypress@9.7.0 http-server --unsafe-perm --silent +RUN cypress install +RUN cypress verify +COPY . /app +WORKDIR /app/public/cypress/videos +CMD ["http-server", "-p", "80", "-i", "false"] RUN docker-compose exec cypress bash /app/run_tests.sh + + +EXPOSE WEBSITE localhost:8000 + + From fd51bd537fa0224df15b6dcc9358ca8819512441 Mon Sep 17 00:00:00 2001 From: Vick Ahuja <69281942+vvickedvveb@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:43:57 -0400 Subject: [PATCH 5/9] Update Layerfile --- Layerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Layerfile b/Layerfile index c86c8f2..30545d7 100644 --- a/Layerfile +++ b/Layerfile @@ -31,7 +31,7 @@ COPY . /app WORKDIR /app/public/cypress/videos CMD ["http-server", "-p", "80", "-i", "false"] -RUN docker-compose exec cypress bash /app/run_tests.sh +RUN docker-compose exec cypress bash /root/services/cypress/run_tests.sh EXPOSE WEBSITE localhost:8000 From 22e987cab5e483d2168f32ae63887e7d611ea9b0 Mon Sep 17 00:00:00 2001 From: Vick Ahuja <69281942+vvickedvveb@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:44:09 -0400 Subject: [PATCH 6/9] Update Layerfile --- Layerfile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Layerfile b/Layerfile index 30545d7..0690d85 100644 --- a/Layerfile +++ b/Layerfile @@ -17,20 +17,6 @@ COPY / /root RUN REPEATABLE docker-compose up -d --build --force-recreate --remove-orphans && sleep 6 - -FROM ubuntu:18.04 -RUN apt-get update && \ - apt-get install gcc g++ make libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 \ - systemd libnss3 libxss1 libasound2 libxtst6 xauth xvfb curl -y -RUN curl -fSsL https://deb.nodesource.com/setup_12.x | bash -RUN apt-get install nodejs -y -RUN npm install -g cypress@9.7.0 http-server --unsafe-perm --silent -RUN cypress install -RUN cypress verify -COPY . /app -WORKDIR /app/public/cypress/videos -CMD ["http-server", "-p", "80", "-i", "false"] - RUN docker-compose exec cypress bash /root/services/cypress/run_tests.sh From e40c4c453b7d934bbfff0c7cb5f219760a8ead97 Mon Sep 17 00:00:00 2001 From: Vick Ahuja <69281942+vvickedvveb@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:45:08 -0400 Subject: [PATCH 7/9] Update Layerfile --- Layerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Layerfile b/Layerfile index 0690d85..e40ec6f 100644 --- a/Layerfile +++ b/Layerfile @@ -17,7 +17,7 @@ COPY / /root RUN REPEATABLE docker-compose up -d --build --force-recreate --remove-orphans && sleep 6 -RUN docker-compose exec cypress bash /root/services/cypress/run_tests.sh +# RUN docker-compose exec cypress bash /root/services/cypress/run_tests.sh EXPOSE WEBSITE localhost:8000 From 4830d4edf6b8f0308246bb42c13059ec33f8a375 Mon Sep 17 00:00:00 2001 From: Vick Ahuja <69281942+vvickedvveb@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:49:45 -0400 Subject: [PATCH 8/9] Update Layerfile --- Layerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Layerfile b/Layerfile index e40ec6f..6161074 100644 --- a/Layerfile +++ b/Layerfile @@ -16,10 +16,4 @@ RUN curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-c COPY / /root RUN REPEATABLE docker-compose up -d --build --force-recreate --remove-orphans && sleep 6 - -# RUN docker-compose exec cypress bash /root/services/cypress/run_tests.sh - - EXPOSE WEBSITE localhost:8000 - - From fbcde790798672e0e76f913531d5f0de9f82195e Mon Sep 17 00:00:00 2001 From: Vick Ahuja <69281942+vvickedvveb@users.noreply.github.com> Date: Sun, 9 Apr 2023 14:35:20 -0400 Subject: [PATCH 9/9] Create Layerfile --- services/web/Layerfile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 services/web/Layerfile diff --git a/services/web/Layerfile b/services/web/Layerfile new file mode 100644 index 0000000..06cca73 --- /dev/null +++ b/services/web/Layerfile @@ -0,0 +1,4 @@ +From /Layerfile + +EXPOSE WEBSITE https://localhost:443 +