From 94c8f21a6cf4a6401c6b6addbd5c44a25fe9a132 Mon Sep 17 00:00:00 2001
From: Deepak Rangarajan <deepak.rangarajan@netl.doe.gov>
Date: Thu, 12 Jan 2023 21:08:00 +0000
Subject: [PATCH] switch back to dockerhub, but using a docker account

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3858a4..b2f5c1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,8 @@ build-img:
     entrypoint: [""]
   script:
     - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - DOCKER_AUTH=$(echo -n "$DOCKER_HUB_USR:$DOCKER_HUB_PASS" | base64)
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"https://index.docker.io/v1/\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --cache=true --context $CI_PROJECT_DIR --dockerfile ./Dockerfile --destination $CI_REGISTRY_IMAGE:latest
   tags:
     - docker
diff --git a/Dockerfile b/Dockerfile
index 1ef5f1d..993fcdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Docker Image for running csg-eb tests
 
-FROM public.ecr.aws/lts/ubuntu:20.04
+FROM ubuntu:20.04
 
 LABEL maintainer="Mark Meredith <mark.meredith@netl.doe.gov>"
 
-- 
GitLab