updated lab readme and build image

4-gitlab-ci/README.md

@@ -1,53 +1,111 @@
 ## Introduction
 
-First off this lab is entirely optional and also not for the faint hearted. Gitlab CI is currently introducing components to replace the current templates and openTofu will be updated to that as soon as they are supported in self managed runners. If you're not comfortable experimenting and cleaning things up in AWS manually **don't do this lab**
+First off this lab is entirely optional and also not for the faint hearted. Gitlab CI is currently introducing components to replace the current templates and openTofu will be updated to that as soon as they are supported in self managed runners. If you're not comfortable experimenting and cleaning things up in AWS manually **don't do this lab**. For this I recommend using the terraform template.
+
+First things first lets get some things setup. Make sure you have a free account on [https://gitlab.com](https://gitlab.com)
 
 ### Get AWS Credentials for Gitlab
 
 Log into the AWS console and head to the IAM service. In here you need to create a new user called gitlab.
 
+![Generate an AWS user](./img/aws-1.png)
 
+Hit next and continue. On the next screen click attach policy and choose Administrator Access 9this is because you sometimes need to use terraform/tofu to create IAM policies)
 
+![Generate an AWS user](./img/aws-2.png)
 
+Now click next until the user is created. You can now click that user in the IAM console and click on the security tab. Here you'll need to click on ```create access key```
 
+![Generate an AWS user](./img/aws-3.png)
 
+Now you can select the top option ```Command Line Interface``` and check the accept box at the bottom of the page then hit next.
+
+![Generate an AWS user](./img/aws-4.png)
+
+Enter gitlab access for the optional field.
+
+![Generate an AWS user](./img/aws-5.png)
+
+Now click ```Download CSV``` and save this file for getting your access keys from later, you'll need to input these into Gitlab.
+
+![Generate an AWS user](./img/aws-6.png)
+
+### Set up Gitlab CI/CD
+
+#### First steps
+1. Login to Gitlab and create a new private repo
+2. Clone that repo either into CloudShell or your local machine
+3. Copy the files from this directories code folder into your new cloned repo
+4. Edit ```versions.tf``` to match your bucket and table created in lab 3
+5. Run ```git add .```
+6. Run ```git commit -a -m "initial commit```
+7. Run ```git push```
+
+#### Set up variables for CI/CD
+1. Login to Gitlab
+2. Open your project repo
+3. Click on Settings > CI/CD
+
+![Settings in Gitlab](./img/gitlab-vars-1.png)
+
+4. Expand the Variables section
+5. Add the following variables as masked and expanded, untick protected. Create Variables for:
+- AWS_ACCESS_KEY_ID (use the value from your downloaded CSV)
+- AWS_SECRET_ACCESS_KEY (use the value from your downloaded CSV)
+- AWS_DEFAULT_REGION (set to eu-west-1)
+
+![Setting variables in Gitlab](./img/variable-full.png)
+
+#### Add a ci/cd template
+
+1. Login to Gitlab
+2. Go to your project
+3. Go to ```Build``` in the left hand menu and then ```Pipeline Editor```
+
+![Pipeline Editor](./img/pipeline.png)
+
+4. Click Configure Pipeline
+5. Click Browse templates or copy the below and paste into your pipeline:
 
 ```yaml
-# This template is a port of the OpenTofu CI/CD component at
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://gitlab.com/components/opentofu
+# https://docs.gitlab.com/ee/development/cicd/templates.html
-# It is generated with the `make backports` command from that project.
-#
-# Please make sure to use the component when your project is hosted on GitLab.com
-# or when you are willing to mirror the component project into your self-managed
-# instance and use it from there.
-#
-# Attention: This template will be removed in favor of the OpenTofu CI/CD component as soon as components
-#            are available for self-managed instances.
-#
 # This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/OpenTofu.latest.gitlab-ci.yml
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
 
 include:
-  - template: OpenTofu/Base.latest.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/OpenTofu/Base.latest.gitlab-ci.yml
+  - template: Terraform/Base.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Terraform/Base.gitlab-ci.yml
 
-stages: [validate, build, deploy, cleanup]
+stages:
+  - validate
+  - test
+  - build
+  - deploy
+  - cleanup
 
 fmt:
-  extends: .opentofu:fmt
+  extends: .terraform:fmt
+  needs: []
 
 validate:
-  extends: .opentofu:validate
+  extends: .terraform:validate
+  needs: []
 
-plan:
+build:
-  extends: .opentofu:plan
+  extends: .terraform:build
+  environment:
+    name: demo
+    action: prepare
 
-apply:
+deploy:
-  extends: .opentofu:apply
+  extends: .terraform:deploy
-
+  dependencies:
-cleanup:
+    - build
-  extends: .opentofu:destroy
+  environment:
+    name: demo
+    action: start
 ```
 
+6. Click commit and your build _should_ begin
 
-
+![Build Pipeline](./img/build.png)
-https://kodekloud.com/blog/understanding-terraform-modules/