From 44a0fc67705dccf8c68ecbd508bf1b7f5523304e Mon Sep 17 00:00:00 2001
From: abregman <abregman@redhat.com>
Date: Fri, 4 Oct 2019 23:08:24 +0300
Subject: [PATCH] Add more questions :)

---
 CONTRIBUTING.md |  1 +
 README.md       | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..3dee4e5
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1 @@
+Use pull requests to contribute to the project.
diff --git a/README.md b/README.md
index ea78a04..fc7f065 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,11 @@
   1. [Network](#network)
   1. [Linux](#linux)
   1. [Ansible](#ansible)
+  1. [Containers](#containers)
   1. [Docker](#docker)
   1. [Python](#python)
   1. [Prometheus](#prometheus)
+  1. [Git](#git)
 
 
 ## Jenkins
@@ -59,7 +61,7 @@
   - Region
   - Edge location
 
-###### S3 - beginner questions
+###### S3 - beginner
 
 - Explain what is S3 and what is it used for
 - What is a bucket?
@@ -80,6 +82,12 @@
 - True or False? object are cached for the life of TTL
 
 
+###### EC2 - beginner
+
+* What type of instances have you created?
+* How to increase RAM for a given EC2 instance?
+
+
 ## Network
 
 Network questions can be found [here](https://github.com/bregman-arie/computer-networking/blob/master/interview_questions/README.md)
@@ -246,6 +254,11 @@ The content of the system_info.j2 template
 I'm {{ ansible_hostname }} and my operating system is {{ ansible_distribution }
 ```
 
+## Containers
+
+* How containers different from VMs?
+* In which scenarios would you use containers and in which you would prefer to use VMs?
+
 ## Docker
 
 * What happens when you run `docker run hello-world`?
@@ -282,6 +295,8 @@ Use the image 'rhel7/rhel' from the registry 'registry.access.redhat.com` to run
 Befor running it, install the httpd package, update all packages and expose port 80.
 ```
 
+* What is the difference between ADD and COPY in Dockerfile?
+
 ## Python
 
 ##### beginner
@@ -359,3 +374,10 @@ Alert manager is responsible for alerts ;)
 ```
 
 * What is an exporter? What is it used for?
+
+## Git
+
+###### beginner
+
+* What is the difference between `git pull` and `git pull`?
+* How do you resolve git conflicts?