From b0437ba2e21fd4d7dfaba0e4aecb553fdce96c4a Mon Sep 17 00:00:00 2001 From: "ryan.kuba" Date: Tue, 20 Sep 2022 16:21:03 -0700 Subject: [PATCH] KASM-3239 add chromium to jammy, focal, and opensuse arm desktops --- dockerfile-kasm-opensuse-15-desktop | 4 ++++ dockerfile-kasm-ubuntu-focal-desktop | 4 ++++ dockerfile-kasm-ubuntu-jammy-desktop | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dockerfile-kasm-opensuse-15-desktop b/dockerfile-kasm-opensuse-15-desktop index 88eae7c..ee94661 100644 --- a/dockerfile-kasm-opensuse-15-desktop +++ b/dockerfile-kasm-opensuse-15-desktop @@ -27,6 +27,10 @@ RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ +# Install Chromium +COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ +RUN if [ "$(uname -m)" == "aarch64" ]; then bash $INST_SCRIPTS/chromium/install_chromium.sh; fi && rm -rf $INST_SCRIPTS/chromium/ + # Install Firefox COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ diff --git a/dockerfile-kasm-ubuntu-focal-desktop b/dockerfile-kasm-ubuntu-focal-desktop index 63ea4b3..abf25b7 100644 --- a/dockerfile-kasm-ubuntu-focal-desktop +++ b/dockerfile-kasm-ubuntu-focal-desktop @@ -26,6 +26,10 @@ RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ +# Install Chromium +COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ +RUN if [ "$(uname -m)" == "aarch64" ]; then bash $INST_SCRIPTS/chromium/install_chromium.sh; fi && rm -rf $INST_SCRIPTS/chromium/ + # Install Firefox COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ diff --git a/dockerfile-kasm-ubuntu-jammy-desktop b/dockerfile-kasm-ubuntu-jammy-desktop index f1c7e50..39ab689 100644 --- a/dockerfile-kasm-ubuntu-jammy-desktop +++ b/dockerfile-kasm-ubuntu-jammy-desktop @@ -26,6 +26,10 @@ RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ +# Install Chromium +COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ +RUN if [ "$(uname -m)" == "aarch64" ]; then bash $INST_SCRIPTS/chromium/install_chromium.sh; fi && rm -rf $INST_SCRIPTS/chromium/ + # Install Firefox COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/