From d33869de52973ed2b0ce39d86f9ba05fab10695b Mon Sep 17 00:00:00 2001
From: James Jones <jamjon3@gmail.com>
Date: Wed, 16 Nov 2022 18:49:55 -0500
Subject: [PATCH] Stubbing out very rough gitlab ci

---
 .gitlab-ci.yml | 17 +++++++++--------
 Dockerfile     |  6 +++++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ac204e..033d744 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,9 +41,9 @@ build:prereleases:
   tags:
     - big-build
   script:
-    - export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | tr -c '[:alnum]_.-' '-')
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$IMAGE_TAG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$IMAGE_TAG"
+    - export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | sed 's|/|-|g')
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
+    - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
   only:
     - branches
   except:
@@ -54,14 +54,15 @@ build:releases:
   tags:
     - big-build
   script:
-    - export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | tr -c '[:alnum]_.-' '-')
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:CI_PROJECT_NAME-$IMAGE_TAG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$IMAGE_TAG"
-    - docker tag "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$IMAGE_TAG" "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-latest"
-    - docker push "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-latest"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:latest"
+    - docker push "$CI_REGISTRY_IMAGE:latest"
   only:
     - tags
 
+CI_COMMIT_TAG
+CI_COMMIT_BRANCH
 
 # image: fedora:latest
 
diff --git a/Dockerfile b/Dockerfile
index 2735bc8..fb04018 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,7 @@
 FROM quay.io/podman/stable:latest
 
-RUN dnf install -y podman-docker buildah skopeo
\ No newline at end of file
+# Adding on the docker alias, docker-compose and other useful stuff
+RUN dnf install -y podman-docker buildah skopeo docker-compose
+
+# Remove the Emulate Docker CLI using podman messages
+RUN touch /etc/containers/nodocker
\ No newline at end of file