From 0b1b577cc40fb346d39ebc21fc6ed0f5b18726fd Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Thu, 30 Jun 2022 14:08:09 +0200
Subject: [PATCH 1/8] fullstacked with chromium

---
 README.md                     | 2 +-
 images/fullstacked/Dockerfile | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8854388..a68fdff 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Available Tags:
 | `latest-base`           | libffi-dev, libicu-dev, build-essential, libssl-dev, ca-certificates, jq, sed, grep, git, curl, wget, zip | Base runner with nothing fancy installed <br> [Dockerfile](images/base/Dockerfile)                                                 |
 | `latest-kaniko-sidecar` | kaniko                                                                                                    | Sidecar used by other runner images to build containers without root privileges                                                    |
 | `latest-ansible-k8s`    | base-image + ansible, helm, kubectl, skopeo                                                               | Runner specialized for automated k8s deployments via ansible <br> For more Details see [Dockerfile](images/ansible-k8s/Dockerfile) |
-| `latest-fullstacked`    | base-image + ansible, helm, maven, openjdk-11, nodejs, go, yarn, angular/cli                              | Runner with a bunch of tools to build your hole application<br> For more Details see [Dockerfile](images/fullstacked/Dockerfile)   |
+| `latest-fullstacked`    | base-image + ansible, helm, maven, temurin-11, nodejs, go, yarn, angular/cli, chromium                    | Runner with a bunch of tools to build your hole application<br> For more Details see [Dockerfile](images/fullstacked/Dockerfile)   |
 
 > Hint: `latest` can be replaced with an specific release version for more stability in your environment.
 
diff --git a/images/fullstacked/Dockerfile b/images/fullstacked/Dockerfile
index 46e2db3..54d68d4 100644
--- a/images/fullstacked/Dockerfile
+++ b/images/fullstacked/Dockerfile
@@ -3,13 +3,14 @@ FROM ghcr.io/fullstack-devops/github-actions-runner:base-latest
 USER root
 # install packages along with jq so we can parse JSON
 # add additional packages as necessary
-ARG PACKAGES="temurin-11-jdk maven nodejs ansible"
+ARG PACKAGES="temurin-11-jdk maven nodejs ansible chromium-browser"
 ARG PACKAGES_PYTHON="kubernetes"
 
 RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
 RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 
 RUN apt-get update \
+  && add-apt-repository -y --update ppa:phd/chromium-browser \
   && add-apt-repository -y --update ppa:ansible/ansible \
   && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
   && apt-get install -y --no-install-recommends ${PACKAGES} \
@@ -48,9 +49,10 @@ RUN mkdir -p /home/${USERNAME}/.m2/ \
 # install npm tools: yarn
 RUN npm install --global yarn @angular/cli@13
 
-USER ${USERNAME}
+USER $USERNAME
 
-RUN pip3 install ${PACKAGES_PYTHON} --user
+RUN mkdir /run/user/$USERID
+RUN pip3 install $PACKAGES_PYTHON --user
 
 # RUN ansible-galaxy install -c -r ${TMP_DIR}/requirements.yml
 RUN ansible-galaxy collection install -c -r ${TMP_DIR}/requirements.yml

From 419ac9cd3e9df8b1870514de0d15460a7b15ec80 Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Thu, 30 Jun 2022 14:30:48 +0200
Subject: [PATCH 2/8] fix permissions

---
 images/fullstacked/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/images/fullstacked/Dockerfile b/images/fullstacked/Dockerfile
index 54d68d4..875b066 100644
--- a/images/fullstacked/Dockerfile
+++ b/images/fullstacked/Dockerfile
@@ -38,20 +38,21 @@ RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
 
 ENV TMP_DIR=/home/${USERNAME}/tmp
 
+RUN mkdir /run/user/$USERID
 RUN mkdir /home/${USERNAME}/.ansible
 RUN mkdir ${TMP_DIR}
 
 COPY requirements.yml ${TMP_DIR}/requirements.yml
 
 RUN mkdir -p /home/${USERNAME}/.m2/ \
-  && chown -R ${USERNAME} /home/${USERNAME}
+  && chown -R $USERNAME /home/$USERNAME \
+  && chown -R $USERNAME /run/user/$USERID
 
 # install npm tools: yarn
 RUN npm install --global yarn @angular/cli@13
 
 USER $USERNAME
 
-RUN mkdir /run/user/$USERID
 RUN pip3 install $PACKAGES_PYTHON --user
 
 # RUN ansible-galaxy install -c -r ${TMP_DIR}/requirements.yml

From 9e92a0c1c6ce926d2f0e88faf1044b5cab1782dd Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Fri, 1 Jul 2022 10:01:29 +0200
Subject: [PATCH 3/8] try google chrome

---
 images/fullstacked/Dockerfile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/images/fullstacked/Dockerfile b/images/fullstacked/Dockerfile
index 875b066..94ed30f 100644
--- a/images/fullstacked/Dockerfile
+++ b/images/fullstacked/Dockerfile
@@ -3,20 +3,28 @@ FROM ghcr.io/fullstack-devops/github-actions-runner:base-latest
 USER root
 # install packages along with jq so we can parse JSON
 # add additional packages as necessary
-ARG PACKAGES="temurin-11-jdk maven nodejs ansible chromium-browser"
+ARG PACKAGES="temurin-11-jdk maven nodejs ansible chromium-browser python3-selenium"
 ARG PACKAGES_PYTHON="kubernetes"
 
 RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
 RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 
+# RUN wget -O - https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xea6e302dc78cc4b087cfc3570ebea9b02842f111 | apt-key add -
+# RUN apt-key adv --fetch-keys "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xea6e302dc78cc4b087cfc3570ebea9b02842f111" \
+# RUN echo 'deb http://ppa.launchpad.net/chromium-team/beta/ubuntu bionic main ' >> /etc/apt/sources.list.d/chromium-team-beta.list
+
 RUN apt-get update \
-  && add-apt-repository -y --update ppa:phd/chromium-browser \
+  # && add-apt-repository -y --update ppa:phd/chromium-browser \
   && add-apt-repository -y --update ppa:ansible/ansible \
   && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
   && apt-get install -y --no-install-recommends ${PACKAGES} \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get clean
 
+RUN curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+RUN apt-get install -y ./google-chrome-stable_current_amd64.deb
+RUN rm google-chrome-stable_current_amd64.deb 
+
 ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,temurin-11,nodejs,go,yarn,helm,ansible"
 # https://github.com/helm/helm/releases
 ARG HELM_VERSION=3.8.1

From e3db70d358f2f6c082c5cd6f80dc048e944b1849 Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Fri, 1 Jul 2022 11:02:56 +0200
Subject: [PATCH 4/8] used trion as template

---
 images/fullstacked/Dockerfile          | 37 +++++++++++++++++++-------
 images/fullstacked/display-chromium    |  3 +++
 images/fullstacked/xvfb-chromium       | 23 ++++++++++++++++
 images/fullstacked/xvfb-chromium-webgl | 21 +++++++++++++++
 4 files changed, 74 insertions(+), 10 deletions(-)
 create mode 100644 images/fullstacked/display-chromium
 create mode 100644 images/fullstacked/xvfb-chromium
 create mode 100644 images/fullstacked/xvfb-chromium-webgl

diff --git a/images/fullstacked/Dockerfile b/images/fullstacked/Dockerfile
index 94ed30f..5a56f1f 100644
--- a/images/fullstacked/Dockerfile
+++ b/images/fullstacked/Dockerfile
@@ -1,29 +1,46 @@
-FROM ghcr.io/fullstack-devops/github-actions-runner:base-latest
+FROM ghcr.io/fullstack-devops/github-actions-runner:latest-base
 
 USER root
 # install packages along with jq so we can parse JSON
 # add additional packages as necessary
-ARG PACKAGES="temurin-11-jdk maven nodejs ansible chromium-browser python3-selenium"
+ARG PACKAGES="temurin-11-jdk maven nodejs ansible python3-selenium xvfb"
 ARG PACKAGES_PYTHON="kubernetes"
 
-RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
+RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true apt-key add -
 RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 
-# RUN wget -O - https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xea6e302dc78cc4b087cfc3570ebea9b02842f111 | apt-key add -
-# RUN apt-key adv --fetch-keys "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xea6e302dc78cc4b087cfc3570ebea9b02842f111" \
-# RUN echo 'deb http://ppa.launchpad.net/chromium-team/beta/ubuntu bionic main ' >> /etc/apt/sources.list.d/chromium-team-beta.list
+ADD xvfb-chromium /usr/bin/xvfb-chromium
+ADD xvfb-chromium-webgl /usr/bin/xvfb-chromium-webgl
+ADD display-chromium /usr/bin/display-chromium
 
 RUN apt-get update \
-  # && add-apt-repository -y --update ppa:phd/chromium-browser \
   && add-apt-repository -y --update ppa:ansible/ansible \
   && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
   && apt-get install -y --no-install-recommends ${PACKAGES} \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get clean
 
-RUN curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-RUN apt-get install -y ./google-chrome-stable_current_amd64.deb
-RUN rm google-chrome-stable_current_amd64.deb 
+RUN MACH=$(uname -m) \
+  && [ $MACH = "x86_64" ] && ( \
+  wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
+  && (dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install; rm google-chrome-stable_current_amd64.deb; apt-get clean; rm -rf /var/lib/apt/lists/* ) \
+  && mv /usr/bin/google-chrome /usr/bin/google-chrome.real \
+  && mv /opt/google/chrome/chrome /opt/google/chrome/google-chrome.real  \
+  && ln -s /usr/lib/x86_64-linux-gnu/libOSMesa.so.6 /opt/google/chrome/libosmesa.so \
+  ) || true  \
+  && [ $MACH != "x86_64" ] && ( \
+  echo "deb http://deb.debian.org/debian buster main" >> /etc/apt/sources.list.d/debian.list \
+  && echo "deb http://deb.debian.org/debian buster-updates main" >> /etc/apt/sources.list.d/debian.list \
+  && echo 'Package: chromium*' >> /etc/apt/preferences.d/chromium.pref \
+  && echo 'Pin: origin "ftp.debian.org"' >> /etc/apt/preferences.d/chromium.pref \
+  && echo 'Pin-Priority: 700' >> /etc/apt/preferences.d/chromium.pref \
+  && apt-get update; apt-get -fy install chromium; apt-get clean; rm -rf /var/lib/apt/lists/* \
+  && mv /usr/bin/chromium /usr/bin/google-chrome.real \
+  ) || true \
+  && rm -f /etc/alternatives/google-chrome \
+  && ln -s /opt/google/chrome/google-chrome.real /etc/alternatives/google-chrome \
+  && ln -s /usr/bin/xvfb-chromium /usr/bin/google-chrome \
+  && ln -s /usr/bin/xvfb-chromium /usr/bin/chromium-browser
 
 ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,temurin-11,nodejs,go,yarn,helm,ansible"
 # https://github.com/helm/helm/releases
diff --git a/images/fullstacked/display-chromium b/images/fullstacked/display-chromium
new file mode 100644
index 0000000..1dd0990
--- /dev/null
+++ b/images/fullstacked/display-chromium
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+google-chrome.real --disable-dev-shm-usage --no-sandbox --no-first-run $@
diff --git a/images/fullstacked/xvfb-chromium b/images/fullstacked/xvfb-chromium
new file mode 100644
index 0000000..63d2c42
--- /dev/null
+++ b/images/fullstacked/xvfb-chromium
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+find_free_servernum() {
+    i=0
+    while [ -f /tmp/.X$i-lock ]; do
+        i=$(($i + 1))
+    done
+    echo $i
+}
+
+export DISPLAY=":$(find_free_servernum)"
+Xvfb "$DISPLAY" -ac -screen 0 "${XVFB_WHD:-1280x720x16}" -nolisten tcp +render &
+xvfb_pid=$!
+
+echo "(wrapper:) launching with: $@"
+
+function cleanup {      
+  kill -TERM $xvfb_pid > /dev/null 2>&1
+}
+
+trap cleanup EXIT
+
+google-chrome.real --disable-dev-shm-usage --no-sandbox --disable-gpu --no-first-run $@
\ No newline at end of file
diff --git a/images/fullstacked/xvfb-chromium-webgl b/images/fullstacked/xvfb-chromium-webgl
new file mode 100644
index 0000000..657c482
--- /dev/null
+++ b/images/fullstacked/xvfb-chromium-webgl
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+find_free_servernum() {
+    i=0
+    while [ -f /tmp/.X$i-lock ]; do
+        i=$(($i + 1))
+    done
+    echo $i
+}
+
+export DISPLAY=":$(find_free_servernum)"
+Xvfb "$DISPLAY" -ac -screen 0 "${XVFB_WHD:-1280x800x16}" -nolisten tcp +render &
+xvfb_pid=$!
+
+function cleanup {      
+  kill -TERM $xvfb_pid > /dev/null 2>&1
+}
+
+trap cleanup EXIT
+
+google-chrome.real --no-sandbox --no-first-run --use-gl=osmesa --enable-webgl --ignore-gpu-blacklist --window-size=1024,768  $@
\ No newline at end of file

From 361f3a9949734d5823f513987ebd09bfa760115f Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Fri, 1 Jul 2022 11:33:47 +0200
Subject: [PATCH 5/8] fix file permissions

---
 images/fullstacked/Dockerfile          | 4 +++-
 images/fullstacked/display-chromium    | 0
 images/fullstacked/xvfb-chromium       | 0
 images/fullstacked/xvfb-chromium-webgl | 0
 4 files changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 images/fullstacked/display-chromium
 mode change 100644 => 100755 images/fullstacked/xvfb-chromium
 mode change 100644 => 100755 images/fullstacked/xvfb-chromium-webgl

diff --git a/images/fullstacked/Dockerfile b/images/fullstacked/Dockerfile
index 5a56f1f..c25a4a1 100644
--- a/images/fullstacked/Dockerfile
+++ b/images/fullstacked/Dockerfile
@@ -6,13 +6,15 @@ USER root
 ARG PACKAGES="temurin-11-jdk maven nodejs ansible python3-selenium xvfb"
 ARG PACKAGES_PYTHON="kubernetes"
 
-RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true apt-key add -
+RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
 RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 
 ADD xvfb-chromium /usr/bin/xvfb-chromium
 ADD xvfb-chromium-webgl /usr/bin/xvfb-chromium-webgl
 ADD display-chromium /usr/bin/display-chromium
 
+RUN chmod +x /usr/bin/display-chromium /usr/bin/xvfb-chromium-webgl /usr/bin/xvfb-chromium
+
 RUN apt-get update \
   && add-apt-repository -y --update ppa:ansible/ansible \
   && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
diff --git a/images/fullstacked/display-chromium b/images/fullstacked/display-chromium
old mode 100644
new mode 100755
diff --git a/images/fullstacked/xvfb-chromium b/images/fullstacked/xvfb-chromium
old mode 100644
new mode 100755
diff --git a/images/fullstacked/xvfb-chromium-webgl b/images/fullstacked/xvfb-chromium-webgl
old mode 100644
new mode 100755

From 2a88514b6123022aff5d3aa9dfec2860802d7c43 Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Fri, 1 Jul 2022 19:29:57 +0200
Subject: [PATCH 6/8] try x86 only

---
 images/fullstacked/Dockerfile | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/images/fullstacked/Dockerfile b/images/fullstacked/Dockerfile
index c25a4a1..5dc117b 100644
--- a/images/fullstacked/Dockerfile
+++ b/images/fullstacked/Dockerfile
@@ -3,7 +3,7 @@ FROM ghcr.io/fullstack-devops/github-actions-runner:latest-base
 USER root
 # install packages along with jq so we can parse JSON
 # add additional packages as necessary
-ARG PACKAGES="temurin-11-jdk maven nodejs ansible python3-selenium xvfb"
+ARG PACKAGES="temurin-11-jdk maven nodejs ansible python3-selenium xvfb libxss1 libosmesa6 libgconf-2-4"
 ARG PACKAGES_PYTHON="kubernetes"
 
 RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
@@ -22,23 +22,11 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get clean
 
-RUN MACH=$(uname -m) \
-  && [ $MACH = "x86_64" ] && ( \
-  wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
+RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
   && (dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install; rm google-chrome-stable_current_amd64.deb; apt-get clean; rm -rf /var/lib/apt/lists/* ) \
   && mv /usr/bin/google-chrome /usr/bin/google-chrome.real \
   && mv /opt/google/chrome/chrome /opt/google/chrome/google-chrome.real  \
   && ln -s /usr/lib/x86_64-linux-gnu/libOSMesa.so.6 /opt/google/chrome/libosmesa.so \
-  ) || true  \
-  && [ $MACH != "x86_64" ] && ( \
-  echo "deb http://deb.debian.org/debian buster main" >> /etc/apt/sources.list.d/debian.list \
-  && echo "deb http://deb.debian.org/debian buster-updates main" >> /etc/apt/sources.list.d/debian.list \
-  && echo 'Package: chromium*' >> /etc/apt/preferences.d/chromium.pref \
-  && echo 'Pin: origin "ftp.debian.org"' >> /etc/apt/preferences.d/chromium.pref \
-  && echo 'Pin-Priority: 700' >> /etc/apt/preferences.d/chromium.pref \
-  && apt-get update; apt-get -fy install chromium; apt-get clean; rm -rf /var/lib/apt/lists/* \
-  && mv /usr/bin/chromium /usr/bin/google-chrome.real \
-  ) || true \
   && rm -f /etc/alternatives/google-chrome \
   && ln -s /opt/google/chrome/google-chrome.real /etc/alternatives/google-chrome \
   && ln -s /usr/bin/xvfb-chromium /usr/bin/google-chrome \

From 9329b8b1e7e942015be5c4d6d3d39f19394edd4a Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Thu, 7 Jul 2022 16:07:44 +0200
Subject: [PATCH 7/8] try 3

---
 images/fullstacked/Dockerfile | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/images/fullstacked/Dockerfile b/images/fullstacked/Dockerfile
index 5dc117b..7eb648e 100644
--- a/images/fullstacked/Dockerfile
+++ b/images/fullstacked/Dockerfile
@@ -3,12 +3,18 @@ FROM ghcr.io/fullstack-devops/github-actions-runner:latest-base
 USER root
 # install packages along with jq so we can parse JSON
 # add additional packages as necessary
-ARG PACKAGES="temurin-11-jdk maven nodejs ansible python3-selenium xvfb libxss1 libosmesa6 libgconf-2-4"
+ARG PACKAGES="temurin-11-jdk maven nodejs ansible chromium python3-selenium xvfb"
 ARG PACKAGES_PYTHON="kubernetes"
 
+## ansible keys
 RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
 RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 
+## chromium ppa and keys
+# RUN apt-key adv --fetch-keys "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xea6e302dc78cc4b087cfc3570ebea9b02842f111" \
+#   && echo 'deb http://ppa.launchpad.net/chromium-team/beta/ubuntu bionic main ' >> /etc/apt/sources.list.d/chromium-team-beta.list
+
+## helper for karma and chromium
 ADD xvfb-chromium /usr/bin/xvfb-chromium
 ADD xvfb-chromium-webgl /usr/bin/xvfb-chromium-webgl
 ADD display-chromium /usr/bin/display-chromium
@@ -17,21 +23,12 @@ RUN chmod +x /usr/bin/display-chromium /usr/bin/xvfb-chromium-webgl /usr/bin/xvf
 
 RUN apt-get update \
   && add-apt-repository -y --update ppa:ansible/ansible \
+  && add-apt-repository -y --update ppa:xtradeb/apps \
   && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
   && apt-get install -y --no-install-recommends ${PACKAGES} \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get clean
 
-RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
-  && (dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install; rm google-chrome-stable_current_amd64.deb; apt-get clean; rm -rf /var/lib/apt/lists/* ) \
-  && mv /usr/bin/google-chrome /usr/bin/google-chrome.real \
-  && mv /opt/google/chrome/chrome /opt/google/chrome/google-chrome.real  \
-  && ln -s /usr/lib/x86_64-linux-gnu/libOSMesa.so.6 /opt/google/chrome/libosmesa.so \
-  && rm -f /etc/alternatives/google-chrome \
-  && ln -s /opt/google/chrome/google-chrome.real /etc/alternatives/google-chrome \
-  && ln -s /usr/bin/xvfb-chromium /usr/bin/google-chrome \
-  && ln -s /usr/bin/xvfb-chromium /usr/bin/chromium-browser
-
 ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,temurin-11,nodejs,go,yarn,helm,ansible"
 # https://github.com/helm/helm/releases
 ARG HELM_VERSION=3.8.1
@@ -64,7 +61,9 @@ RUN mkdir -p /home/${USERNAME}/.m2/ \
   && chown -R $USERNAME /run/user/$USERID
 
 # install npm tools: yarn
-RUN npm install --global yarn @angular/cli@13
+ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
+RUN npm install --location=global yarn pnpm @angular/cli@14 \
+  && npm cache clean --force
 
 USER $USERNAME
 

From a80d84009fffdfccf861b84e57b44fdf537f8de3 Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Fri, 8 Jul 2022 09:35:37 +0200
Subject: [PATCH 8/8] add ENV CHROME_BIN

---
 images/fullstacked/Dockerfile          | 5 +----
 images/fullstacked/display-chromium    | 2 +-
 images/fullstacked/xvfb-chromium       | 2 +-
 images/fullstacked/xvfb-chromium-webgl | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/images/fullstacked/Dockerfile b/images/fullstacked/Dockerfile
index 7eb648e..2fdc31e 100644
--- a/images/fullstacked/Dockerfile
+++ b/images/fullstacked/Dockerfile
@@ -10,11 +10,8 @@ ARG PACKAGES_PYTHON="kubernetes"
 RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
 RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 
-## chromium ppa and keys
-# RUN apt-key adv --fetch-keys "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xea6e302dc78cc4b087cfc3570ebea9b02842f111" \
-#   && echo 'deb http://ppa.launchpad.net/chromium-team/beta/ubuntu bionic main ' >> /etc/apt/sources.list.d/chromium-team-beta.list
-
 ## helper for karma and chromium
+ENV CHROME_BIN="/usr/bin/chromium"
 ADD xvfb-chromium /usr/bin/xvfb-chromium
 ADD xvfb-chromium-webgl /usr/bin/xvfb-chromium-webgl
 ADD display-chromium /usr/bin/display-chromium
diff --git a/images/fullstacked/display-chromium b/images/fullstacked/display-chromium
index 1dd0990..706212f 100755
--- a/images/fullstacked/display-chromium
+++ b/images/fullstacked/display-chromium
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-google-chrome.real --disable-dev-shm-usage --no-sandbox --no-first-run $@
+$CHROME_BIN --disable-dev-shm-usage --no-sandbox --no-first-run $@
diff --git a/images/fullstacked/xvfb-chromium b/images/fullstacked/xvfb-chromium
index 63d2c42..953633f 100755
--- a/images/fullstacked/xvfb-chromium
+++ b/images/fullstacked/xvfb-chromium
@@ -20,4 +20,4 @@ function cleanup {
 
 trap cleanup EXIT
 
-google-chrome.real --disable-dev-shm-usage --no-sandbox --disable-gpu --no-first-run $@
\ No newline at end of file
+$CHROME_BIN --disable-dev-shm-usage --no-sandbox --disable-gpu --no-first-run $@
\ No newline at end of file
diff --git a/images/fullstacked/xvfb-chromium-webgl b/images/fullstacked/xvfb-chromium-webgl
index 657c482..f581a7f 100755
--- a/images/fullstacked/xvfb-chromium-webgl
+++ b/images/fullstacked/xvfb-chromium-webgl
@@ -18,4 +18,4 @@ function cleanup {
 
 trap cleanup EXIT
 
-google-chrome.real --no-sandbox --no-first-run --use-gl=osmesa --enable-webgl --ignore-gpu-blacklist --window-size=1024,768  $@
\ No newline at end of file
+$CHROME_BIN --no-sandbox --no-first-run --use-gl=osmesa --enable-webgl --ignore-gpu-blacklist --window-size=1024,768  $@
\ No newline at end of file