Skip to content

Commit a7dd4a5

Browse files
lorcanraelorcanrae
committed
merge main -> main-automation: conflict resolution
2 parents a424ee4 + 2830523 commit a7dd4a5

File tree

6 files changed

+32
-199
lines changed

6 files changed

+32
-199
lines changed

‎LINUX.md‎

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,6 @@ Don't worry, we'll go into more detail in each of the individual sections.
4545
Let's start :rocket:
4646

4747

48-
## Zoom
49-
50-
To be able to interact when we are not in the same physical room, we will be using [Zoom](https://zoom.us/), a video conferencing tool.
51-
52-
:warning: If you already have Zoom installed, please make sure that the version is at least **5.6**.
53-
54-
Go to [zoom.us/download](https://zoom.us/download).
55-
56-
Under **Zoom Client** click the **Download** button.
57-
58-
Open the file you have just downloaded to install the app.
59-
60-
Open the Zoom app.
61-
62-
If you already have a Zoom account, sign in using your credentials.
63-
64-
If not, click on the **Sign Up Free** link:
65-
66-
![Sign Up Free to Zoom](https://github.com/lewagon/setup/blob/master/images/zoom_sign_up_free.png)
67-
68-
You will be redirected to Zoom's website to complete a form.
69-
70-
When it's done, go back to the Zoom app and sign in using your credentials.
71-
72-
You should then see a screen like this:
73-
74-
![Zoom Home Screen](https://github.com/lewagon/setup/blob/master/images/zoom_home_screen.png)
75-
76-
You can now close the Zoom app.
77-
78-
7948
## Slack
8049

8150
[Slack](https://slack.com/) is a communication platform pretty popular in the tech industry.
@@ -767,25 +736,25 @@ In this section, we will use [GitHub CLI](https://cli.github.com/) to interact w
767736

768737
It should already be installed on your computer from the previous commands.
769738

739+
We will use the GitHub CLI (`gh`) to connect to GitHub using *SSH*, a protocol to log in using SSH keys instead of the well known username/password pair.
740+
770741
First in order to **login**, copy-paste the following command in your terminal:
771742

772743
:warning: **DO NOT edit the `email`**
773744

774745
```bash
775-
gh auth login -s 'user:email' -w
746+
gh auth login -s 'user:email' -w --git-protocol ssh
776747
```
777748

778-
gh will ask you few questions:
779-
780-
`What is your preferred protocol for Git operations?` With the arrows, choose `SSH` and press `Enter`. SSH is a protocol to log in using SSH keys instead of the well known username/password pair.
749+
`gh` will ask you few questions:
781750

782-
`Generate a new SSH key to add to your GitHub account?` Press `Enter` to ask gh to generate the SSH keys for you.
751+
- `Generate a new SSH key to add to your GitHub account?` Press `Enter` to ask gh to generate the SSH keys for you.
783752

784-
If you already have SSH keys, you will see instead `Upload your SSH public key to your GitHub account?` With the arrows, select your public key file path and press `Enter`.
753+
If you already have SSH keys, you will see instead `Upload your SSH public key to your GitHub account?` With the arrows, select your public key file path and press `Enter`.
785754

786-
`Enter a passphrase for your new SSH key (Optional)`. Type something you want and that you'll remember. It's a password to protect your private key stored on your hard drive. Then press `Enter`.
755+
- `Enter a passphrase for your new SSH key (Optional)`. Type something you want and that you'll remember. It's a password to protect your private key stored on your hard drive. Then press `Enter`.
787756

788-
`Title for your SSH key`. You can leave it at the proposed "GitHub CLI", press `Enter`.
757+
- `Title for your SSH key`. You can leave it at the proposed "GitHub CLI", press `Enter`.
789758

790759
You will then get the following output:
791760

@@ -1328,5 +1297,3 @@ You should have received an email from Le Wagon inviting you to sign up on [Kitt
13281297
- One from GitHub, inviting you to `lewagon` team. **Accept it** otherwise you won't be able to access the lecture slides.
13291298

13301299
If you haven't, please contact your teaching team.
1331-
1332-

‎WINDOWS.md‎

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,6 @@ Don't worry, we'll go into more detail in each of the individual sections.
4545
Let's start :rocket:
4646

4747

48-
## Zoom
49-
50-
To be able to interact when we are not in the same physical room, we will be using [Zoom](https://zoom.us/), a video conferencing tool.
51-
52-
:warning: If you already have Zoom installed, please make sure that the version is at least **5.6**.
53-
54-
Go to [zoom.us/download](https://zoom.us/download).
55-
56-
Under **Zoom Client** click the **Download** button.
57-
58-
Open the file you have just downloaded to install the app.
59-
60-
Open the Zoom app.
61-
62-
If you already have a Zoom account, sign in using your credentials.
63-
64-
If not, click on the **Sign Up Free** link:
65-
66-
![Sign Up Free to Zoom](https://github.com/lewagon/setup/blob/master/images/zoom_sign_up_free.png)
67-
68-
You will be redirected to Zoom's website to complete a form.
69-
70-
When it's done, go back to the Zoom app and sign in using your credentials.
71-
72-
You should then see a screen like this:
73-
74-
![Zoom Home Screen](https://github.com/lewagon/setup/blob/master/images/zoom_home_screen.png)
75-
76-
You can now close the Zoom app.
77-
78-
7948
## Slack
8049

8150
[Slack](https://slack.com/) is a communication platform pretty popular in the tech industry.
@@ -747,25 +716,25 @@ In this section, we will use [GitHub CLI](https://cli.github.com/) to interact w
747716

748717
It should already be installed on your computer from the previous commands.
749718

719+
We will use the GitHub CLI (`gh`) to connect to GitHub using *SSH*, a protocol to log in using SSH keys instead of the well known username/password pair.
720+
750721
First in order to **login**, copy-paste the following command in your terminal:
751722

752723
:warning: **DO NOT edit the `email`**
753724

754725
```bash
755-
gh auth login -s 'user:email' -w
726+
gh auth login -s 'user:email' -w --git-protocol ssh
756727
```
757728

758-
gh will ask you few questions:
759-
760-
`What is your preferred protocol for Git operations?` With the arrows, choose `SSH` and press `Enter`. SSH is a protocol to log in using SSH keys instead of the well known username/password pair.
729+
`gh` will ask you few questions:
761730

762-
`Generate a new SSH key to add to your GitHub account?` Press `Enter` to ask gh to generate the SSH keys for you.
731+
- `Generate a new SSH key to add to your GitHub account?` Press `Enter` to ask gh to generate the SSH keys for you.
763732

764-
If you already have SSH keys, you will see instead `Upload your SSH public key to your GitHub account?` With the arrows, select your public key file path and press `Enter`.
733+
If you already have SSH keys, you will see instead `Upload your SSH public key to your GitHub account?` With the arrows, select your public key file path and press `Enter`.
765734

766-
`Enter a passphrase for your new SSH key (Optional)`. Type something you want and that you'll remember. It's a password to protect your private key stored on your hard drive. Then press `Enter`.
735+
- `Enter a passphrase for your new SSH key (Optional)`. Type something you want and that you'll remember. It's a password to protect your private key stored on your hard drive. Then press `Enter`.
767736

768-
`Title for your SSH key`. You can leave it at the proposed "GitHub CLI", press `Enter`.
737+
- `Title for your SSH key`. You can leave it at the proposed "GitHub CLI", press `Enter`.
769738

770739
You will then get the following output:
771740

@@ -1308,5 +1277,3 @@ You should have received an email from Le Wagon inviting you to sign up on [Kitt
13081277
- One from GitHub, inviting you to `lewagon` team. **Accept it** otherwise you won't be able to access the lecture slides.
13091278

13101279
If you haven't, please contact your teaching team.
1311-
1312-

‎_partials/virtual_machine.md‎

Lines changed: 8 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,14 @@
1-
## Virtual Machine (VM)
2-
3-
**👌 Note: Skip to the next section if you already have a VM set up**
4-
5-
_Note: The following section requires you already have a [Google Cloud Platform](https://cloud.google.com/) account associated with an active [Billing account](https://console.cloud.google.com/billing)._
6-
7-
- Go to console.cloud.google.com > > Compute Engine > VM instances > Create instance
8-
- Name it `lewagon-data-eng-vm-<github_username>`, replace `<github_username>` with your own, e.g. `krokrob`
9-
- Region `europe-west1`, choose the closest one among the [available regions](https://cloud.google.com/compute/docs/regions-zones#available)
10-
11-
<img alt="gcloud-console-vm-create-instance" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-create-instance.png" width=500>
12-
- In the section `Machine configuration` under the sub-heading `Machine type`
13-
- Select General purpose > PRESET > e2-standard-4
14-
15-
<img alt="gcloud-console-vm-e2-standard4" src="https://wagon-public-assets.s3.eu-west-3.amazonaws.com/v9dv42llst8qjp2uj0d1yr00po1g" width=500>
16-
- Boot disk > Change
17-
- Operating system > Ubuntu
18-
- Version > Ubuntu 22.04 LTS x86/64
19-
- Boot disk type > Balanced persistent disk
20-
- Size > upgrade to 150GB
21-
22-
<img alt="gcloud-console-vm-ubunt" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-ubunt.png" width=500>
23-
- Open `Networking, Disks, ...` under `Advanced options`
24-
- Open `Networking`
25-
26-
<img alt="gcloud-console-vm-networking" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-networking.png" width=500>
27-
- Go to `Network interfaces` and click on `default default (...)` with a downward arrow on the right.
28-
29-
<img alt="gcloud-console-vm-network-interfaces" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-network-interfaces.png" width=500>
30-
- This opened a box `Edit network interface`
31-
- Go to the dropdown `External IPv4 address`, click on it, click on `RESERVE STATIC EXTERNAL IP ADDRESS`
32-
33-
<img alt="gcloud-console-vm-create-static-ip" src="https://wagon-public-assets.s3.eu-west-3.amazonaws.com/1ax09j2zld7x0lsvpp9p8ld8u5vc" width=300>
34-
- Give it a name, like "lewagon-data-eng-vm-ip-<github_username>" (replace `<github_username>` with your own) and description "Le Wagon - Data Engineering VM IP". This will take a few seconds.
351

36-
<img alt="gcloud-console-reserve-static-ip" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-reserve-static-ip.png" width=300>
37-
38-
- You will now have a public IP associated with your account, and later to your VM instance. Click on `Done` at the bottom of the section `Edit network interface` you were in.
39-
40-
<img alt="gcloud-console-new-external-ip" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-new-external-ip.png" width=300>
41-
42-
### Public SSH key
43-
- Open the `Security` section
44-
45-
<img alt="gcloud-console-vm-security" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-security.png" width=300>
46-
- Open the `Manage access` subsection
47-
48-
<img alt="gcloud-console-manage-access" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-manage-access.png" width=200>
49-
- Go to `Add manually generated SSH keys` and click `Add item`
50-
51-
<img alt="gcloud-console-add-manual-ssh-key" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-add-manual-ssh-key.png" width=500>
52-
- In your terminal display your public SSH key:
53-
- Windows: navigate to where you created your SSH key and open `id_ed25519.pub`
54-
55-
- Mac/Linux users can use:
56-
```bash
57-
cat ~/.ssh/id_ed25519.pub
58-
# OR cat ~/.ssh/de-bootcamp.pub if you created a unique key
59-
```
60-
- Copy your public SSH key and paste it:
61-
62-
<img alt="gcloud-console-add-ssh-key-pub" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-add-ssh-key-pub.png" width=500>
63-
- On the right hand side you should see
64-
65-
<img alt="gcloud-console-vm-price-month" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-price-month.png" width=300>
66-
- You should be good to go and click `CREATE` at the bottom
2+
## Virtual Machine (VM)
673

68-
<img alt="gcloud-console-vm-create" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-create.png" width=500>
69-
- It will take a few minutes for your virtual machine (VM) to be created. Your instance will show up like below when ready, with a green circled tick, named `lewagon-data-eng-vm-krokrob` (`krokrob` being replaced by your GitHub username).
4+
_Note: The VM setup requires a [Google Cloud Platform](https://cloud.google.com/) account associated with an active [Billing account](https://console.cloud.google.com/billing)_
705

71-
<img alt="gcloud-console-vm-instance-running" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-instance-running.png" width=500>
72-
- Click on your instance
6+
ℹ️ In the guide, left click to drag the screenshots if necessary
737

74-
<img alt="gcloud-console-vm-running" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-running.png" width=500>
75-
- Go down to the section `SSH keys`, and write down your username (you need it for the next section)
8+
ℹ️ You may adjust the aspect ratio of your browser window to see the full screenshots
769

77-
<img alt="gcloud-console-vm-username" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-username.png" width=300>
10+
<a href="https://scribehow.com/embed/Create_a_Google_Cloud_VM_Instance_with_SSH_Key__1ohFlAbSR9yoG28S0PDfwg">
11+
<img src="images/scribe_gcp_vm.png" alt="scribe gcp vm" width="500">
12+
</a>
7813

79-
Congrats, your virtual machine is up and running, it is time to connect it with VS Code!
14+
**👌 Follow [this guide](https://scribehow.com/embed/Create_a_Google_Cloud_VM_Instance_with_SSH_Key__1ohFlAbSR9yoG28S0PDfwg) or skip to the next section if you already have a VM set up**

‎build.rb‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# NOTE(ssaunier): This script needs https://github.com/lewagon/setup to be cloned as well
1212
MAC_OS = %w[
1313
intro
14-
setup/zoom
1514
setup/macos_slack
1615
setup/slack_settings
1716
setup/github
@@ -51,7 +50,6 @@
5150

5251
WINDOWS = %w[
5352
intro
54-
setup/zoom
5553
setup/windows_slack
5654
setup/slack_settings
5755
setup/github
@@ -89,7 +87,6 @@
8987

9088
LINUX = %w[
9189
intro
92-
setup/zoom
9390
setup/ubuntu_slack
9491
setup/slack_settings
9592
setup/github

‎images/scribe_gcp_vm.png‎

196 KB
Loading

‎macOS.md‎

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,6 @@ Don't worry, we'll go into more detail in each of the individual sections.
4545
Let's start :rocket:
4646

4747

48-
## Zoom
49-
50-
To be able to interact when we are not in the same physical room, we will be using [Zoom](https://zoom.us/), a video conferencing tool.
51-
52-
:warning: If you already have Zoom installed, please make sure that the version is at least **5.6**.
53-
54-
Go to [zoom.us/download](https://zoom.us/download).
55-
56-
Under **Zoom Client** click the **Download** button.
57-
58-
Open the file you have just downloaded to install the app.
59-
60-
Open the Zoom app.
61-
62-
If you already have a Zoom account, sign in using your credentials.
63-
64-
If not, click on the **Sign Up Free** link:
65-
66-
![Sign Up Free to Zoom](https://github.com/lewagon/setup/blob/master/images/zoom_sign_up_free.png)
67-
68-
You will be redirected to Zoom's website to complete a form.
69-
70-
When it's done, go back to the Zoom app and sign in using your credentials.
71-
72-
You should then see a screen like this:
73-
74-
![Zoom Home Screen](https://github.com/lewagon/setup/blob/master/images/zoom_home_screen.png)
75-
76-
You can now close the Zoom app.
77-
78-
7948
## Slack
8049

8150
[Slack](https://slack.com/) is a communication platform pretty popular in the tech industry.
@@ -783,25 +752,25 @@ In this section, we will use [GitHub CLI](https://cli.github.com/) to interact w
783752

784753
It should already be installed on your computer from the previous commands.
785754

755+
We will use the GitHub CLI (`gh`) to connect to GitHub using *SSH*, a protocol to log in using SSH keys instead of the well known username/password pair.
756+
786757
First in order to **login**, copy-paste the following command in your terminal:
787758

788759
:warning: **DO NOT edit the `email`**
789760

790761
```bash
791-
gh auth login -s 'user:email' -w
762+
gh auth login -s 'user:email' -w --git-protocol ssh
792763
```
793764

794-
gh will ask you few questions:
795-
796-
`What is your preferred protocol for Git operations?` With the arrows, choose `SSH` and press `Enter`. SSH is a protocol to log in using SSH keys instead of the well known username/password pair.
765+
`gh` will ask you few questions:
797766

798-
`Generate a new SSH key to add to your GitHub account?` Press `Enter` to ask gh to generate the SSH keys for you.
767+
- `Generate a new SSH key to add to your GitHub account?` Press `Enter` to ask gh to generate the SSH keys for you.
799768

800-
If you already have SSH keys, you will see instead `Upload your SSH public key to your GitHub account?` With the arrows, select your public key file path and press `Enter`.
769+
If you already have SSH keys, you will see instead `Upload your SSH public key to your GitHub account?` With the arrows, select your public key file path and press `Enter`.
801770

802-
`Enter a passphrase for your new SSH key (Optional)`. Type something you want and that you'll remember. It's a password to protect your private key stored on your hard drive. Then press `Enter`.
771+
- `Enter a passphrase for your new SSH key (Optional)`. Type something you want and that you'll remember. It's a password to protect your private key stored on your hard drive. Then press `Enter`.
803772

804-
`Title for your SSH key`. You can leave it at the proposed "GitHub CLI", press `Enter`.
773+
- `Title for your SSH key`. You can leave it at the proposed "GitHub CLI", press `Enter`.
805774

806775
You will then get the following output:
807776

@@ -1344,5 +1313,3 @@ You should have received an email from Le Wagon inviting you to sign up on [Kitt
13441313
- One from GitHub, inviting you to `lewagon` team. **Accept it** otherwise you won't be able to access the lecture slides.
13451314

13461315
If you haven't, please contact your teaching team.
1347-
1348-

0 commit comments

Comments
 (0)