Signed-off-by: Arnaud Morin <arnaud.morin@gmail.com>
2.5 KiB
Intro
blabla
Fork
Fork this repo to your own github repo
Ex. 1 - python
Here is the output of a python application:
$ python run.py 'Hello buddies'
_ _ _ _ _ _ _ _
| | | | ___ | || | ___ | |__ _ _ __| | __| |(_) ___ ___
| |_| | / _ \| || | / _ \ | '_ \ | | | | / _` | / _` || | / _ \/ __|
| _ || __/| || || (_) | | |_) || |_| || (_| || (_| || || __/\__ \
|_| |_| \___||_||_| \___/ |_.__/ \__,_| \__,_| \__,_||_| \___||___/
Can you write the run.py application and put it in the ex1 folder of the repo?
Ex. 2 - docker
In ex2 folder, you will find a plik
binary (taken from https://plik.ovh).
Can you build very lighweight docker image that contains ONLY plik
binary, and that execute plik
by default?
Push your Dockerfile in the ex2 folder.
Ex. 3 - terraform
In ex3 folder, you will find an incomplete openrc
file.
You will need to amend the file to configure the correct OS_USERNAME
and OS_PASSWORD
with the one that we gave to you.
Then, using terraform
, can you write a plan to boot a d2-4
on GRA7
region with a floating IP.
Bonus, on that instance, make sure a web server (nginx
) is running.
Push your main.tf
file in ex3 folder.
Ex. 4 - git
In this repo, there are two branches:
- stein
- queens
Stein contains the following commits:
Queens contains the following commits:
So the common ancestor is A (same commit ID).
B has been cherry-picked from stein to queens, without conflicts.
F has also been cherry-picked but with conflicts (solved, of course).
Exercice
You will need to create two branches:
- merged
- rebased
Merged
Create the merged branch first:
git checkout -b merged origin/queens
Then merge the stein branch into your branch
git merge origin/stein
You will have a conflict to solved.
Solve it, then push your merged
branch to your repo.
Rebased
Now create the rebased branch:
git checkout -b rebased origin/queens
Now rebase it on top of stein:
git rebase -i origin/stein
You will have a conflict to solved.
Solve it, then push your rebased
branch to your repo.
Check diff
Now check the diff between your two branches merged
and rebased
.
git diff merged..rebased
Can you explain why you have a diff?
Write down the explanation in ex4 folder (like in a README.md
file)