extern/workspaces-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-images.git synced 2024-11-28 19:13:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-3239-chromium-arm' into 'develop'

Browse Source 
Resolve KASM-3239 "Feature/ chromium arm"

Closes KASM-3239

See merge request kasm-technologies/internal/workspaces-images!86
This commit is contained in:
Richard Koliser 2022-09-26 19:06:17 +00:00
commit 1137d204f9
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dockerfile-kasm-opensuse-15-desktop
View File

@ -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/ COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/
RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $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 # Install Firefox
COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/
COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/
@ -48,10 +52,6 @@ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/n
COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/
### Install Teams
COPY ./src/opensuse/install/teams $INST_SCRIPTS/teams/
RUN bash $INST_SCRIPTS/teams/install_teams.sh && rm -rf $INST_SCRIPTS/teams/
### Install Libre Office ### Install Libre Office
COPY ./src/opensuse/install/libre_office $INST_SCRIPTS/libre_office/ COPY ./src/opensuse/install/libre_office $INST_SCRIPTS/libre_office/
RUN bash $INST_SCRIPTS/libre_office/install_libre_office.sh && rm -rf $INST_SCRIPTS/libre_office/ RUN bash $INST_SCRIPTS/libre_office/install_libre_office.sh && rm -rf $INST_SCRIPTS/libre_office/
@ -80,6 +80,10 @@ RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/tel
COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/
RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/
### Install Teams
COPY ./src/opensuse/install/teams $INST_SCRIPTS/teams/
RUN bash $INST_SCRIPTS/teams/install_teams.sh && rm -rf $INST_SCRIPTS/teams/
#ADD ./src/common/scripts $STARTUPDIR #ADD ./src/common/scripts $STARTUPDIR
RUN $STARTUPDIR/set_user_permission.sh $HOME RUN $STARTUPDIR/set_user_permission.sh $HOME

4
dockerfile-kasm-ubuntu-focal-desktop
View File

@ -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/ COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/
RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $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 # Install Firefox
COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/
COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/

4
dockerfile-kasm-ubuntu-jammy-desktop
View File

@ -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/ COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/
RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $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 # Install Firefox
COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/
COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/

5
src/ubuntu/install/chromium/install_chromium.sh
View File

@ -80,7 +80,10 @@ else
fi fi
EOL EOL
chmod +x /usr/bin/chromium-browser chmod +x /usr/bin/chromium-browser
cp /usr/bin/chromium-browser /usr/bin/chromium
if [ "${DISTRO}" != "opensuse" ]; then
cp /usr/bin/chromium-browser /usr/bin/chromium
fi
if [[ "${DISTRO}" == @(centos|oracle7|oracle8|opensuse) ]]; then if [[ "${DISTRO}" == @(centos|oracle7|oracle8|opensuse) ]]; then
cat >> $HOME/.config/mimeapps.list <<EOF cat >> $HOME/.config/mimeapps.list <<EOF