From 58b0a7e0407966f2fac2240674a1b1555fce351e Mon Sep 17 00:00:00 2001
From: AHMZA <hamzaahmed12328@gmail.com>
Date: Thu, 9 Dec 2021 15:40:28 +0000
Subject: [PATCH] rolled back to simple docker file requiring me to build
 locally and upload image

---
 .gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++++
 Dockerfile     |  3 +--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47807a5..cb4866f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 stages:
   - build
   - dockerize
@@ -29,3 +30,36 @@ Dockerize:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
+=======
+#stages:
+#  - build
+#  - dockerize
+#
+#variables:
+#  CONTAINER_IMAGE: registry.gitlab.com/ahmza/blog:latest
+#
+#Build:
+#  stage: build
+#  image: alpine:latest
+#  before_script:
+#    - which curl || ( apk update && apk add curl )
+#    - curl -L https://github.com/gohugoio/hugo/releases/download/v0.90.0/hugo_0.90.0_Linux-64bit.tar.gz > hugo.tar.gz
+#    - tar -zxf hugo.tar.gz
+#    - mv hugo /usr/local/bin
+#  script:
+#    - hugo
+#  artifacts:
+#    paths:
+#      - public
+#
+#Dockerize:
+#  stage: dockerize
+#  image:
+#    name: gcr.io/kaniko-project/executor:debug
+#    entrypoint: [""]
+#  script:
+#    - mkdir -p /kaniko/.docker
+#    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+#    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
+#    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
+>>>>>>> 6c539b5 (rolled back to simple docker file requiring me to build locally and upload image)
diff --git a/Dockerfile b/Dockerfile
index 77e6b49..913b8c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
 FROM nginx
-COPY /public /usr/share/nginx/html
+COPY public /usr/share/nginx/html
 EXPOSE 80
-#ENTRYPOINT ["nginx","-g","daemon off;"]