From d7e1989dae9d259757b86a80c32539fee4bb1a6f Mon Sep 17 00:00:00 2001
From: Blair V <blair.vanderlugt@gmail.com>
Date: Tue, 21 Sep 2021 14:54:31 +0300
Subject: [PATCH 1/5] add build

---
 .dockerignore   |  7 +++++++
 .gitlab-ci.yaml | 15 +++++++++++++++
 README.md       |  5 +++++
 3 files changed, 27 insertions(+)
 create mode 100644 .dockerignore
 create mode 100644 .gitlab-ci.yaml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..9e1d9de
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+pelican
+__pycache__
+*.pyc
+*.o
+output/
+node_modules/
+.venv/
diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml
new file mode 100644
index 0000000..ededfd0
--- /dev/null
+++ b/.gitlab-ci.yaml
@@ -0,0 +1,15 @@
+stages:
+  - build
+  - test
+  - deploy
+
+image: docker:19.03.12
+
+before_script:
+  - docker info
+
+build:
+  stage: build
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE:${TAG:-latest} . 
+    - docker push $CI_REGISTRY_IMAGE:${TAG:-latest}
diff --git a/README.md b/README.md
index 2b563b1..c21bcd1 100644
--- a/README.md
+++ b/README.md
@@ -10,5 +10,10 @@ source env/bin/activate
 pip install -r requirements.txt
 make devserver
 ```
+## With Docker
+
+docker build -t ge-blog .
+
+docker run -p 8000:80 ge-blog 
 
 

From 693aa6e770f387616933c87d5510532f35ddfcae Mon Sep 17 00:00:00 2001
From: Blair V <blair.vanderlugt@gmail.com>
Date: Tue, 21 Sep 2021 14:55:53 +0300
Subject: [PATCH 2/5] rename build file

---
 .gitlab-ci.yaml => .gitlab-ci.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .gitlab-ci.yaml => .gitlab-ci.yml (100%)

diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yml
similarity index 100%
rename from .gitlab-ci.yaml
rename to .gitlab-ci.yml

From 09382696e31903f7cfd4bbcecec8ed3fbabd8947 Mon Sep 17 00:00:00 2001
From: Blair V <blair.vanderlugt@gmail.com>
Date: Tue, 21 Sep 2021 15:00:47 +0300
Subject: [PATCH 3/5] update expose port so its clear

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 1446540..c967a1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,6 @@ FROM openresty/openresty:buster-fat
 
 COPY --from=build /app/output /var/www/pelican/output/ 
 
+EXPOSE 80
+
 COPY nginx.conf /etc/nginx/conf.d/default.conf

From 88832a7113dac2568e0ebbe635ba70e8ca78b847 Mon Sep 17 00:00:00 2001
From: Blair V <blair.vanderlugt@gmail.com>
Date: Tue, 21 Sep 2021 15:03:01 +0300
Subject: [PATCH 4/5] add build tag

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ededfd0..0fbab38 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,8 @@ before_script:
 
 build:
   stage: build
+  tags:
+    - integration
   script:
     - docker build -t $CI_REGISTRY_IMAGE:${TAG:-latest} . 
     - docker push $CI_REGISTRY_IMAGE:${TAG:-latest}

From a53dd144d1adbb5d6963a34984b1822195581fb3 Mon Sep 17 00:00:00 2001
From: Blair V <blair.vanderlugt@gmail.com>
Date: Tue, 21 Sep 2021 15:05:41 +0300
Subject: [PATCH 5/5] login to registry

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fbab38..cca01be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ image: docker:19.03.12
 
 before_script:
   - docker info
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
 build:
   stage: build