Skip to content
Snippets Groups Projects
Commit a8fd770f authored by Galtier Virginie's avatar Galtier Virginie
Browse files

updated version of the docker image

parent b619a602
No related branches found
No related tags found
No related merge requests found
Pipeline #56173 passed
Stage: publish
    Stage: deploy
      Expand all Hide whitespace changes
      Inline Side-by-side
      Docker/Dockerfile
      + 19
      − 65
      View file @ a8fd770f
      # Image for the 1CC RS course
      # Image for the 1EL RS course
      # user = abc, password = abc
      # sudo: no password
      ......@@ -7,19 +7,16 @@
      # docker build -t 1elrs .
      # Run:
      # docker run --rm --detach --publish 3000:3000 --publish 3001:3001 --env TITLE=RS 1elrs:latest
      # docker run --rm --detach --publish 3000:3000 --publish 3001:3001 --env TITLE=RS --device /dev/snd:/dev/snd 1elrs:latest
      # or, if you want to "mount" a host directory to the /home/abc/PersistentDir directory in the container:
      # docker run --rm --detach --publish 3000:3000 --publish 3001:3001 --env TITLE=RS --volume YOUR_CHOICE_OF_PATH:/home/abc/PersistentDir:rw 1elrs:latest
      # docker run --rm --detach --publish 3000:3000 --publish 3001:3001 --env TITLE=RS --volume YOUR_CHOICE_OF_PATH:/home/abc/PersistentDir:rw --device /dev/snd:/dev/snd 1elrs:latest
      # and to use your host user id and host group id (XXXX is given by id -u and YYYY by id -g):
      # docker run --rm --detach --publish 3000:3000 --publish 3001:3001 --env TITLE=RS --env PUID=XXXX --env PGID=YYYY --volume YOUR_CHOICE_OF_PATH:/home/abc/PersistentDir:rw 1elrs:latest
      # docker run --rm --detach --publish 3000:3000 --publish 3001:3001 --env TITLE=RS --env PUID=XXXX --env PGID=YYYY --volume YOUR_CHOICE_OF_PATH:/home/abc/PersistentDir:rw --device /dev/snd:/dev/snd 1elrs:latest
      # Connect to:
      # Use a web browser and visit http://127.0.0.1:3000/
      #FROM lscr.io/linuxserver/webtop:ubuntu-xfce
      # testée le 22 mai 2024, problème d'instabilité, retour à une ancienne version :
      # attention, adpater les pip install en bas
      FROM linuxserver/webtop:ubuntu-xfce-version-9dbcf55c
      FROM lscr.io/linuxserver/webtop:ubuntu-icewm
      # Give the abc user a regular home and nice prompt
      RUN mkdir /home/abc && mkdir /home/abc/Downloads && mkdir /home/abc/PersistentDir && chown -R abc:abc /home/abc && usermod -d /home/abc abc
      ......@@ -29,79 +26,36 @@ ENV HOME=/home/abc
      # Install a few utilities
      RUN apt-get update && apt-get upgrade -y && \
      apt-get install -y zip unzip git gedit tree iputils-ping wget vim net-tools traceroute evince
      apt-get install -y zip unzip git gedit tree iputils-ping wget vim pip net-tools traceroute evince iproute2 curl xfce4-terminal hping3 dnsutils
      # get rid of gedit warning messages
      RUN echo "#!/bin/bash" > /usr/bin/gedit-null && echo "/usr/bin/gedit \""\$\@\"" 2>/dev/null" >> /usr/bin/gedit-null && chmod 755 /usr/bin/gedit-null
      RUN echo "alias gedit=/usr/bin/gedit-null" >> /etc/bash.bashrc
      # Add bookmarks to Firefox
      # Add Firefox profile
      COPY profiles.ini /home/abc/.mozilla/firefox/profiles.ini
      COPY prefs.js /home/abc/.mozilla/firefox/rs.default-release/prefs.js
      COPY favicons.sqlite /home/abc/.mozilla/firefox/rs.default-release/favicons.sqlite
      COPY places.sqlite /home/abc/.mozilla/firefox/rs.default-release/places.sqlite
      COPY prefs.js /home/abc/.mozilla/firefox/sip.default-release/prefs.js
      COPY favicons.sqlite /home/abc/.mozilla/firefox/sip.default-release/favicons.sqlite
      COPY places.sqlite /home/abc/.mozilla/firefox/sip.default-release/places.sqlite
      RUN chown -R abc:abc /home/abc/.mozilla/
      ## Python
      RUN apt-get install -y python3 python3-venv python3-pip
      # Pytest
      RUN apt-get install -y python3-pytest
      # Python lib
      RUN sudo apt-get install -y pip
      # latest VSCodium version
      RUN wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg | gpg --dearmor | dd of=/usr/share/keyrings/vscodium-archive-keyring.gpg
      RUN echo 'deb [ signed-by=/usr/share/keyrings/vscodium-archive-keyring.gpg ] https://download.vscodium.com/debs vscodium main' | tee /etc/apt/sources.list.d/vscodium.list && apt update
      RUN apt install -y codium
      RUN echo "alias codium='codium --no-sandbox'" >> /etc/bash.bashrc
      RUN sed -i 's/\/usr\/share\/codium\/codium /\/usr\/share\/codium\/codium --no-sandbox /g' /usr/share/applications/codium.desktop
      # Python extension
      RUN mkdir -p /home/abc/.vscode-oss/extensions && chown -R abc:abc /home/abc/.vscode-oss && cd /home/abc/.vscode-oss/extensions && wget https://openvsxorg.blob.core.windows.net/resources/ms-python/python/2023.12.0/ms-python.python-2023.12.0.vsix && unzip ms-python.python-2023.12.0.vsix
      # Filius (a network simulator)
      RUN apt-get install -y openjdk-17-jdk openjdk-17-jre
      RUN wget https://www.lernsoftware-filius.de/downloads/Setup/filius_2.5.1_all.deb && apt install -y ./filius_2.5.1_all.deb && rm filius_2.5.1_all.deb
      RUN mkdir /home/abc/.filius && chown -R abc:abc /home/abc/.filius
      COPY konfig.xml /home/abc/.filius
      # JASPER (for the Alternate Bit Protocol simulation)
      # use "appletviewer jasper-1.7/html/ABP.html" to launch the applet
      COPY jasper-1.7.zip /home/abc/
      RUN unzip /home/abc/jasper-1.7.zip -d /home/abc/ && rm /home/abc/jasper-1.7.zip && chown -R abc:abc /home/abc/jasper-1.7
      RUN apt-get update && apt-get upgrade -y && \
      apt-get install -y openjdk-8-jdk
      # pour Jérôme François
      #---------------------
      RUN mkdir -p /home/abc/gallery
      COPY JeromeFrancois/ /home/abc/gallery/
      RUN chown -R abc:abc /home/abc/gallery && usermod -d /home/abc/gallery abc
      # Pour le son dans le container
      # lancer le container avec l'option --device /dev/snd:/dev/snd
      RUN apt-get update && apt-get upgrade -y && \
      apt-get install -y hping3 dnsutils
      apt-get install -y alsa-base alsa-utils
      RUN sudo usermod -aG audio abc \
      && newgrp audio
      # à l'installation la configuration de wireshark demande si les non-superusers ont le droit de capturer des paquets, le -y de l'apt install n'y peut rien
      # solution : https://askubuntu.com/questions/1275842/install-wireshark-without-confirm
      RUN echo "wireshark-common wireshark-common/install-setuid boolean true" | debconf-set-selections && \
      DEBIAN_FRONTEND=noninteractive apt-get -y install wireshark
      # Pip install avec les options nécessaires avec la dernière version de l'image de base...
      #RUN pip install --no-cache-dir --upgrade --break-system-packages pip && \
      # pip install --no-cache-dir --break-system-packages streamlit pillow
      RUN pip install pip && \
      pip install streamlit pillow
      #-----------------------
      RUN echo "export PATH=$PATH" > /etc/environment
      # Clean up
      RUN apt-get clean && \
      rm -rf \
      RUN apt-get autoremove -y && apt-get autoclean -y && apt-get clean -y
      RUN rm -rf \
      /tmp/* \
      /var/lib/apt/lists/* \
      /var/tmp/*
      /var/tmp/*
      Docker/favicons.sqlite
      + 0
      − 0
      View file @ a8fd770f
      No preview for this file type
      Docker/places.sqlite
      + 0
      − 0
      View file @ a8fd770f
      No preview for this file type
      Docker/prefs.js
      + 84
      − 87
      View file @ a8fd770f
      This diff is collapsed.
      Docker/profiles.ini
      + 3
      − 3
      View file @ a8fd770f
      [Install4F96D1932A9F858E]
      Default=rs.default-release
      Default=sip.default-release
      Locked=1
      [Profile1]
      Name=default
      IsRelative=1
      Path=rs.default
      Path=sip.default
      Default=1
      [Profile0]
      Name=default-release
      IsRelative=1
      Path=rs.default-release
      Path=sip.default-release
      [General]
      StartWithLastProfile=1
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment