From 16cd6b22253fd535170ed3c32dbf7cde0dd04233 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed <h.4hmz4@gmail.com>
Date: Thu, 16 Nov 2023 19:28:47 +0000
Subject: [PATCH] fixed dodgy Dockerfile and cleaned up .gitlab-ci.yml

---
 .gitlab-ci.yml | 10 +++-------
 Dockerfile     |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b315c3..7d0878d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,15 @@
 image: jdrouet/docker-with-buildx:stable
 
 variables:
-  # If set to 0 gitlab will not build the image
-  BUILD: 1
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
   # Major.Minor.Release
   # Major - Shouldn't change often, Big changes to the site
   # Minor - starts from 0 when Major is incremented +1 for each version that goes public
   # Release - For each time a development milestone is reached
-  VERSION: 1.1.1
+  VERSION: 1.2.0
+  BUILD: 1 # If set to 0 gitlab will not build the image
   IMAGE_TAG: $CI_REGISTRY_IMAGE:$VERSION
-  # Grab Variables for TINA CMS
-  TINA_CID: $TINA_CID
-  TINA_TOKEN: $TINA_TOKEN
 
 services:
   - docker:dind
@@ -23,6 +19,6 @@ build:
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker buildx create --use
-    - docker buildx build --build-arg TINA_CID="${TINA_CID}" --build-arg TINA_TOKEN="{$TINA_TOKEN}" --no-cache --platform linux/arm64,linux/amd64 -t $IMAGE_TAG --push .
+    - docker buildx build --build-arg --no-cache --platform linux/arm64,linux/amd64 -t $IMAGE_TAG --push .
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "staging") && $BUILD == "1"
diff --git a/Dockerfile b/Dockerfile
index 99eef31..936b856 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN git clone --recurse-submodules https://gitlab.com/AHMZA/blog.git
 WORKDIR blog
 
 # run hugo --minify to generate static files
-hugo --minify
+RUN hugo --minify
 
 
 # Nginx image is as basic as we can get