Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 25a597d8 authored by Philippe Gauron's avatar Philippe Gauron Committed by Philippe Gauron
Browse files

Suppression de l'installation automatique VirtualBox

parent 08942319
......@@ -24,9 +24,15 @@
## "apt install sudo"
## "usermod -aG sudo [MAINUSER]"
## then completely close session and open it again
## 3 for installing on virtual machine: check that
## /etc/apt/sources.list contains contrib
## check that cdrom is removed/commented from this file if necessary
## 3 for installing on virtual machine:
## a. check that /etc/apt/sources.list contains contrib
## b. check that cdrom is removed/commented from this file if necessary
## c. sudo apt update
## sudo apt install build-essential module-assistant
## sudo m-a prepare
## Expand menu Devices and click on Insert Guest Additions CD image...
## sudo sh /media/cdrom0/VBoxLinuxAdditions.run
## Reboot
## 4 get the script ("sudo apt install git" &
## "git clone https://gitlab.in2p3.fr/CCThomX/installation.git")
## 5 check if setxkbmap is well configured if necessary
......@@ -38,8 +44,6 @@
## 9 test:
## * DOWNLOAD_ONLY: launching the script with the same configuration
## should work offline
## * VIRTUALBOX: increasing the size of virtualbox window should
## increase the size of virtual screen
## * DATABASE: connection to MariaDB (Debian 9) or MySQL (Debian 8)
## should work : this is automatically checked at the end of installation.
## `mysql -h localhost -u tango -p` followed by `USE tango` and then `SHOW tables;`
......@@ -120,8 +124,6 @@
DOWNLOAD_ONLY=0
## Checking and activating dependencies
DEPENDENCIES=1
## VirtualBox
VIRTUALBOX=0
## Database server and PHPMyAdmin
DATABASE=0
## TANGO base tools
......@@ -372,10 +374,6 @@ fi
## Prints final corrected configuration
echo ""
echo "Final configuration to install: "
if [ "${VIRTUALBOX}" -eq "1" ]
then
echo "VIRTUALBOX"
fi
if [ "${DATABASE}" -eq "1" ]
then
echo "Database server and PHPMyAdmin"
......@@ -485,14 +483,6 @@ sudo apt install --assume-yes git mercurial
# pip
sudo apt install --assume-yes python-pip
if [ "${VIRTUALBOX}" -eq "1" ]
then
echo
info "downloading software for VIRTUALBOX"
sudo apt install -d modules-assistant build-essential
fi
if [ "${DATABASE}" -eq "1" ]
then
echo
......@@ -640,23 +630,6 @@ fi
sudo apt install --assume-yes host
### Specific installation for virtual machines (big screen and copy/paste)
if [ "${VIRTUALBOX}" -eq "1" ]
then
echo
info "installation of VIRTUALBOX options"
## Disable screensaver which can block VIRTUALBOX
sudo apt remove --assume-yes light-locker
## Installation of VirtualBox addons for bigger resolutions
sudo apt install modules-assistant build-essential
sudo m-a prepare
sudo sh /media/cdrom/VBoxLinuxAdditions.run
fi
### Installation of DATABASE DB server ###
if [ "${DATABASE}" -eq "1" ]
then
......
Markdown is supported
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