From 19e73f7895e9f3d86b3e641fb9108d1a7d3a9bea Mon Sep 17 00:00:00 2001
From: Terry Brady <terrence.brady@ucop.edu>
Date: Wed, 24 Jul 2024 17:00:27 -0700
Subject: [PATCH] move ui dockerfile

---
 mrt-services/inventory/mrt-inventory |  2 +-
 mrt-services/ui/.dockerignore        |  9 -----
 mrt-services/ui/Dockerfile           | 54 ----------------------------
 mrt-services/ui/ldap-ca.crt          | 18 ----------
 mrt-services/ui/mrt-dashboard        |  2 +-
 5 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 mrt-services/ui/.dockerignore
 delete mode 100644 mrt-services/ui/Dockerfile
 delete mode 100644 mrt-services/ui/ldap-ca.crt

diff --git a/mrt-services/inventory/mrt-inventory b/mrt-services/inventory/mrt-inventory
index 15ef9a9..afd61cc 160000
--- a/mrt-services/inventory/mrt-inventory
+++ b/mrt-services/inventory/mrt-inventory
@@ -1 +1 @@
-Subproject commit 15ef9a92233e0a482675bd053839dbc6f3e9dacf
+Subproject commit afd61cce87f3e7728255d19aaa512a2c708c44e3
diff --git a/mrt-services/ui/.dockerignore b/mrt-services/ui/.dockerignore
deleted file mode 100644
index e87cd16..0000000
--- a/mrt-services/ui/.dockerignore
+++ /dev/null
@@ -1,9 +0,0 @@
-mrt-dashboard/config/credentials.yml.enc
-mrt-dashboard/Dockerfile
-mrt-dashboard/vendor/
-mrt-dashboard/.byebug_history
-mrt-dashboard/tmp/
-mrt-dashboard/log/
-mrt-dashboard/coverage/
-mrt-dashboard/.bundle/
-mrt-dashboard/public/assets
\ No newline at end of file
diff --git a/mrt-services/ui/Dockerfile b/mrt-services/ui/Dockerfile
deleted file mode 100644
index 789ed7c..0000000
--- a/mrt-services/ui/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-#*********************************************************************
-#   Copyright 2019 Regents of the University of California
-#   All rights reserved
-#*********************************************************************
-# See https://itnext.io/docker-rails-puma-nginx-postgres-999cd8866b18
-#   docker build -t cdluc3/mrt-dashboard .
-
-FROM public.ecr.aws/docker/library/ruby:3
-RUN apt-get update -y -qq && apt-get install -y build-essential libpq-dev nodejs && apt-get -y upgrade
-
-# Set an environment variable where the Rails app is installed to inside of Docker image
-ENV RAILS_ROOT /var/www/app_name
-RUN mkdir -p $RAILS_ROOT
-
-# Set working directory
-WORKDIR $RAILS_ROOT
-
-# Setting env up
-ENV RAILS_ENV='docker'
-ENV RACK_ENV='docker'
-
-# Adding gems
-COPY mrt-dashboard/Gemfile Gemfile
-COPY mrt-dashboard/Gemfile.lock Gemfile.lock
-
-RUN gem install bundler
-RUN bundle install 
-RUN mkdir pid
-
-# Adding project files
-COPY mrt-dashboard .
-RUN bundle install 
-
-# Build a discardable master.key and credentials.yml.enc file for docker deployment
-RUN EDITOR=nano rails credentials:edit
-
-ENV SSM_SKIP_RESOLUTION=Y
-RUN bundle exec rails assets:precompile && \
-    bundle exec rails dev:cache
-    
-EXPOSE 3000 8086 1234
-
-# https://serverfault.com/questions/683605/docker-container-time-timezone-will-not-reflect-changes
-ENV TZ=America/Los_Angeles
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-# CA cert for LDAP SSL access
-RUN mkdir /usr/local/share/ca-certificates/extra
-COPY ldap-ca.crt /usr/local/share/ca-certificates/extra/ldap-ca.crt
-RUN /usr/sbin/update-ca-certificates
-
-RUN echo Docker Build `date` > .version
-
-CMD ["bundle", "exec", "puma", "-C", "config/application.rb", "-p", "8086"]
diff --git a/mrt-services/ui/ldap-ca.crt b/mrt-services/ui/ldap-ca.crt
deleted file mode 100644
index 21d0696..0000000
--- a/mrt-services/ui/ldap-ca.crt
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC9DCCAdygAwIBAgIEFrUdMzANBgkqhkiG9w0BAQsFADA8MSswKQYDVQQKEyJP
-cGVuREogUlNBIFNlbGYtU2lnbmVkIENlcnRpZmljYXRlMQ0wCwYDVQQDEwRsZGFw
-MB4XDTIwMTAwNjAzMTgyNloXDTQwMTAwMTAzMTgyNlowPDErMCkGA1UEChMiT3Bl
-bkRKIFJTQSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZTENMAsGA1UEAxMEbGRhcDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7GjpKSerGphRtE+p5Vxeyr
-U4tYrpBM19UjbUFqmJ6PIdPHmssjuUitb6kjCYbspUw63a2E2xlpzPwREDTQYB2Y
-zucUkYm93qYozErmI1pwXlmyLrdnw/nDgGf/jvyTku17srswML7So9MHWCHj+dUz
-I9qUXTVIeg7E8NhFSvE9bqXuDoYip3IbXAORobjqC5WzP5hFaO5hjv0wpdgKS9Q8
-ahgWv6mZscUg5MdrFVUti4ETSXJe9Zaex1SJJPMHVWaHVmwyUY1RLUe1Ds0hQWez
-qXZX8me7E/0AI1iYOqLQ/6QC3k1AHZf/HGh+lniRTMA8qm5e7r3k+iSgS+Qyg5MC
-AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZ/WUZaCVlFrpXAR8/A3EykmPKigW9/lL
-HDO79+hv3Zobhux+LLvxaHvAXDVwcKebB/DuONIQZmJdWUmyiQZlvWGJo9nSXsgr
-AfYgdGtoAmPDE0uPpVPg1chQhNAa2ZSBrKmoct/Lrsk5bkKTWSP3IBGxaCWXn54y
-cb5Qf+ofo0e1yzU8Q6MprDR81vsbMk/DWAXxYjWQUk4M5mEQfZCtNXyTt0Ul4qka
-jQYtkcFDBcGPW0g+Dl/pvD15qxbTyPJ+tYyKB/oGvMB9aKVUOCFniNaxce4LrHRe
-Sp2yvbyWMAmgWEcOTprONfCFl47MShOuO9ZdJnYSzoDRwTVEI2CCKA==
------END CERTIFICATE-----
diff --git a/mrt-services/ui/mrt-dashboard b/mrt-services/ui/mrt-dashboard
index ee41ed4..dd9d4fa 160000
--- a/mrt-services/ui/mrt-dashboard
+++ b/mrt-services/ui/mrt-dashboard
@@ -1 +1 @@
-Subproject commit ee41ed4ccba7ad8fd46d805ac5d4faf8a76489c3
+Subproject commit dd9d4fae6a717a3807a61a28c5650470c05eff68