From 7be22b5a43362eed0131902f7423ada6538c4390 Mon Sep 17 00:00:00 2001 From: Caleb Evans Date: Mon, 12 Feb 2024 15:15:39 -0700 Subject: [PATCH 1/2] Fix the install of unzip --- dockerfiles/interop/Dockerfile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dockerfiles/interop/Dockerfile b/dockerfiles/interop/Dockerfile index 9f866a5..c4e43fe 100644 --- a/dockerfiles/interop/Dockerfile +++ b/dockerfiles/interop/Dockerfile @@ -5,9 +5,17 @@ FROM docker.io/cypress/included:12.7.0 ENV CYPRESS_CACHE_FOLDER=/tmp/.cache/Cypress ENV npm_config_cache=/tmp/.cache/npm -# Update container and install unzip -RUN apt -y update && \ - apt install -y unzip +# Must remove the Google Chrome repository because there is a missing GPG key and it causes the build to fail +# Then run "apt update" and instal gnupg to add the missing GPG key for Google Chrome +# Then re-add the Google Chrome repository +# After fixing the GPG issue, we can install unzip (the only reason all of that had to be done...) +RUN echo "" > /etc/apt/sources.list.d/google-chrome.list \ + && apt -y update \ + && apt install -y gnupg \ + && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ + && wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \ + && apt -y update \ + && apt install -y unzip # Create /tmp/windup-ui-tests, copy this repo in to the container and install required Node packages RUN mkdir /tmp/windup-ui-tests From 6b86d34f89ae1d073ffc6f176e1777006cebee35 Mon Sep 17 00:00:00 2001 From: Caleb Evans Date: Mon, 12 Feb 2024 15:41:49 -0700 Subject: [PATCH 2/2] Fix the install unzip command --- dockerfiles/interop/Dockerfile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dockerfiles/interop/Dockerfile b/dockerfiles/interop/Dockerfile index c4e43fe..a850130 100644 --- a/dockerfiles/interop/Dockerfile +++ b/dockerfiles/interop/Dockerfile @@ -5,15 +5,9 @@ FROM docker.io/cypress/included:12.7.0 ENV CYPRESS_CACHE_FOLDER=/tmp/.cache/Cypress ENV npm_config_cache=/tmp/.cache/npm -# Must remove the Google Chrome repository because there is a missing GPG key and it causes the build to fail -# Then run "apt update" and instal gnupg to add the missing GPG key for Google Chrome -# Then re-add the Google Chrome repository -# After fixing the GPG issue, we can install unzip (the only reason all of that had to be done...) +# Must remove the Google Chrome repository to run apt update/install because the GPG is missing. +# Install unzip RUN echo "" > /etc/apt/sources.list.d/google-chrome.list \ - && apt -y update \ - && apt install -y gnupg \ - && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ - && wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \ && apt -y update \ && apt install -y unzip