From cd258a40b8d2c5172d44bedd4806c06a57e948ed Mon Sep 17 00:00:00 2001
From: Dagger <mrpvtdagger@gmail.com>
Date: Wed, 25 May 2022 00:20:38 +0000
Subject: [PATCH 1/4] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c20a34..e2d23c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,7 @@
-docker-build:
-  image: docker:latest
-  stage: build
-  services:
-    - docker:dind
-  before_script:
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+build-test:
+  image: python:3.9
   script:
-    - |
-      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
-        tag=""
-        echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
-      else
-        tag=":$CI_COMMIT_REF_SLUG"
-        echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
-      fi
-    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
-    - docker push "$CI_REGISTRY_IMAGE${tag}"
-  rules:
-    - if: $CI_COMMIT_BRANCH
-      exists:
-        - Dockerfile
+    - python --version
+    - pip --version
+    - pip install ./requirements.txt
+    - uvicorn app:app --host 0.0.0.0 --port 80
\ No newline at end of file

From 865051f84b034da72c78d1f93b9c3a42521a0b6e Mon Sep 17 00:00:00 2001
From: Dagger <mrpvtdagger@gmail.com>
Date: Wed, 25 May 2022 00:23:07 +0000
Subject: [PATCH 2/4] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2d23c7..a4161d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,5 +3,5 @@ build-test:
   script:
     - python --version
     - pip --version
-    - pip install ./requirements.txt
+    - pip install requirements.txt
     - uvicorn app:app --host 0.0.0.0 --port 80
\ No newline at end of file

From ecec11d069f8d53d2eba6bd75ea2e26a4b148981 Mon Sep 17 00:00:00 2001
From: Dagger <mrpvtdagger@gmail.com>
Date: Wed, 25 May 2022 00:24:29 +0000
Subject: [PATCH 3/4] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4161d8..d05000f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,5 +3,5 @@ build-test:
   script:
     - python --version
     - pip --version
-    - pip install requirements.txt
+    - pip install -r requirements.txt
     - uvicorn app:app --host 0.0.0.0 --port 80
\ No newline at end of file

From ed35ea2afbf24f1520d69c75610253a14c96b4e2 Mon Sep 17 00:00:00 2001
From: Dagger <mrpvtdagger@gmail.com>
Date: Wed, 25 May 2022 00:54:04 +0000
Subject: [PATCH 4/4] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d05000f..6c4fe4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,4 +4,13 @@ build-test:
     - python --version
     - pip --version
     - pip install -r requirements.txt
-    - uvicorn app:app --host 0.0.0.0 --port 80
\ No newline at end of file
+    - echo "pytest needs finishing"
+
+build-docker:
+  image: docker
+  services:
+    - docker:dind
+  script:
+    - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
+    - docker build -t $CI_REGISTRY_IMAGE .
+    - docker push $CI_REGISTRY_IMAGE
\ No newline at end of file