From 55902c7d8a4416db1336ed9da672d06cc943b51d Mon Sep 17 00:00:00 2001 From: Christopher Fremond <34804391+Frenchris@users.noreply.github.com> Date: Tue, 21 Jan 2020 12:47:01 +0000 Subject: [PATCH 1/6] Update ascii-art.en.md --- subjects/ascii-art/ascii-art.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subjects/ascii-art/ascii-art.en.md b/subjects/ascii-art/ascii-art.en.md index 41302ae48..fce24953a 100644 --- a/subjects/ascii-art/ascii-art.en.md +++ b/subjects/ascii-art/ascii-art.en.md @@ -2,7 +2,7 @@ ### Objectives -Ascii-art consists on receiving a `string` has an argument and outputting the `string` in a graphic representation of ASCII. +Ascii-art consists on receiving a `string` as an argument and outputting the `string` in a graphic representation of ASCII. - This project should handle numbers, letters, spaces, special characters and `\n`. - Take a look on the ASCII manual. From 19564068f8b3ab14c665bab12d1440604523c3c9 Mon Sep 17 00:00:00 2001 From: Christopher Fremond <34804391+Frenchris@users.noreply.github.com> Date: Tue, 21 Jan 2020 12:48:28 +0000 Subject: [PATCH 2/6] Update ascii-art.en.md --- subjects/ascii-art/ascii-art.en.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/subjects/ascii-art/ascii-art.en.md b/subjects/ascii-art/ascii-art.en.md index fce24953a..eb90b26dd 100644 --- a/subjects/ascii-art/ascii-art.en.md +++ b/subjects/ascii-art/ascii-art.en.md @@ -5,7 +5,7 @@ Ascii-art consists on receiving a `string` as an argument and outputting the `string` in a graphic representation of ASCII. - This project should handle numbers, letters, spaces, special characters and `\n`. -- Take a look on the ASCII manual. +- Take a look at the ASCII manual. This project will help you learn about : @@ -20,14 +20,14 @@ This project will help you learn about : - Your project must be written in **Go**. - The code must respect the [**good practices**](https://public.01-edu.org/subjects/good-practices.en). -- It is recommended that the code should present a **test file**. +- It is recommended that the code present a **test file**. - It will be given some [**banner**](https://github.com/01-edu/public/blob/master/subjects/ascii-art) files with a specific graphical template representation of ASCII. The files are formatted in a way that it is not necessary to change them. ### Banner Format - Each character has an height of 8 lines. -- Characters are separate by a new line `\n`. +- Characters are separated by a new line `\n`. - Here is an example of ' ', '!' and '"'(one dot represents one space) : ```console From b9ecee39e5b9ae66327df8c6f68f8be9d4d50790 Mon Sep 17 00:00:00 2001 From: Christopher Fremond <34804391+Frenchris@users.noreply.github.com> Date: Tue, 21 Jan 2020 12:59:52 +0000 Subject: [PATCH 3/6] Update ascii-art-output.en.md --- subjects/ascii-art/ascii-art-output.en.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/subjects/ascii-art/ascii-art-output.en.md b/subjects/ascii-art/ascii-art-output.en.md index 446de9419..2270098f0 100644 --- a/subjects/ascii-art/ascii-art-output.en.md +++ b/subjects/ascii-art/ascii-art-output.en.md @@ -2,7 +2,7 @@ ### Objectives -- You must follow the same [instructions](https://public.01-edu.org/subjects/ascii-art/ascii-art.en) as in the first subject but writing the result into a file. +- You must follow the same [instructions](https://public.01-edu.org/subjects/ascii-art/ascii-art.en) as in the first subject **while** writing the result into a file. - The file must be named by using the flag `--output=`, in which `--output` is the flag and `` is the file name. @@ -13,13 +13,13 @@ This project will help you learn about : - Ways to receive data. - Ways to output data. - Manipulation of strings. -- Learning about the choice of outputs. +- Choices of outputs. ### Instructions - Your project must be written in **Go**. - The code must respect the [**good practices**](https://public.01-edu.org/subjects/good-practices.en). -- It is recommended that the code should present a **test file**. +- It is recommended that the code presents a **test file**. ### Usage From bc5265c13381524a08b47774f5fc88dd8203f638 Mon Sep 17 00:00:00 2001 From: Xavier Petit <32063953+xpetit@users.noreply.github.com> Date: Tue, 21 Jan 2020 15:24:06 +0000 Subject: [PATCH 4/6] Add virtIO disks --- scripts/install_client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_client.sh b/scripts/install_client.sh index 152b68dea..979e3cf09 100755 --- a/scripts/install_client.sh +++ b/scripts/install_client.sh @@ -10,7 +10,7 @@ cd $script_dir . set.sh disk=$(lsblk -o tran,kname,hotplug,type,fstype -pr | - grep -e nvme -e sata -e sas -e ata | + grep -e nvme -e sata -e sas -e ata -e vda | grep '0 disk' | cut -d' ' -f2 | sort | From 70458843695f986b2caf16c5994040d31d85a4b6 Mon Sep 17 00:00:00 2001 From: Xavier Petit <32063953+xpetit@users.noreply.github.com> Date: Tue, 21 Jan 2020 15:45:22 +0000 Subject: [PATCH 5/6] Remove useless service --- scripts/ubuntu_tweaks.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ubuntu_tweaks.sh b/scripts/ubuntu_tweaks.sh index 594edcf6b..eaf1947fc 100755 --- a/scripts/ubuntu_tweaks.sh +++ b/scripts/ubuntu_tweaks.sh @@ -80,6 +80,7 @@ services=" apt-daily-upgrade.timer apt-daily.timer console-setup.service +e2scrub_reap.service keyboard-setup.service motd-news.timer remote-fs.target From d40b45c73493a9b7540e00d17410234950d4e93a Mon Sep 17 00:00:00 2001 From: Xavier Petit <32063953+xpetit@users.noreply.github.com> Date: Tue, 21 Jan 2020 15:59:38 +0000 Subject: [PATCH 6/6] Add docker --- scripts/docker.sh | 14 ++++++++++++++ scripts/install_client.sh | 1 + 2 files changed, 15 insertions(+) create mode 100755 scripts/docker.sh diff --git a/scripts/docker.sh b/scripts/docker.sh new file mode 100755 index 000000000..056015961 --- /dev/null +++ b/scripts/docker.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Install Docker + +script_dir="$(cd -P "$(dirname "$BASH_SOURCE")" && pwd)" +cd $script_dir +. set.sh + +apt-get -y install apt-transport-https ca-certificates curl gnupg-agent software-properties-common +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - +add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu disco stable" +apt-get update +apt-get -y install docker-ce docker-ce-cli containerd.io +adduser student docker diff --git a/scripts/install_client.sh b/scripts/install_client.sh index 979e3cf09..dd3ff77dd 100755 --- a/scripts/install_client.sh +++ b/scripts/install_client.sh @@ -43,6 +43,7 @@ apt-get -yf install . vscode.sh . libreoffice.sh . exam.sh +. docker.sh # Install additional packages pkgs="