From bb5a85987511bf06772599f17e9baae22e95077d Mon Sep 17 00:00:00 2001 From: Terry Brady Date: Wed, 24 Jul 2024 13:12:25 -0700 Subject: [PATCH 1/4] commits --- mrt-services/audit/mrt-audit | 2 +- mrt-services/inventory/mrt-inventory | 2 +- mrt-services/replic/mrt-replic | 2 +- mrt-services/store/mrt-store | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mrt-services/audit/mrt-audit b/mrt-services/audit/mrt-audit index 8ab0194..f087850 160000 --- a/mrt-services/audit/mrt-audit +++ b/mrt-services/audit/mrt-audit @@ -1 +1 @@ -Subproject commit 8ab01946bcd568f7df968c93bacec802331fd576 +Subproject commit f087850ae825a8d3197801c2524729f35d3d3aa6 diff --git a/mrt-services/inventory/mrt-inventory b/mrt-services/inventory/mrt-inventory index ef0c807..8c2ee6e 160000 --- a/mrt-services/inventory/mrt-inventory +++ b/mrt-services/inventory/mrt-inventory @@ -1 +1 @@ -Subproject commit ef0c807de52a6c3668690f83279661f96d9733ef +Subproject commit 8c2ee6e07052c6b769f1391bb3e745be9489a172 diff --git a/mrt-services/replic/mrt-replic b/mrt-services/replic/mrt-replic index ee5e870..2c4a26d 160000 --- a/mrt-services/replic/mrt-replic +++ b/mrt-services/replic/mrt-replic @@ -1 +1 @@ -Subproject commit ee5e87047e48d5dcdbe0061c0b92e22ee0a718a2 +Subproject commit 2c4a26d4de509c52e7275f8827ead7bb70261d28 diff --git a/mrt-services/store/mrt-store b/mrt-services/store/mrt-store index b391091..22244d1 160000 --- a/mrt-services/store/mrt-store +++ b/mrt-services/store/mrt-store @@ -1 +1 @@ -Subproject commit b391091408987b395220a1ae73c3bbbacaa8e7b8 +Subproject commit 22244d17f66538c5d1d4a382f7dec4cb88fb6d2e From 281486efbee0054c719bdcbd127c65973b7d4672 Mon Sep 17 00:00:00 2001 From: Terry Brady Date: Wed, 24 Jul 2024 14:11:00 -0700 Subject: [PATCH 2/4] update commits --- mrt-services/audit/mrt-audit | 2 +- mrt-services/inventory/mrt-inventory | 2 +- mrt-services/replic/mrt-replic | 2 +- mrt-services/store/mrt-store | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mrt-services/audit/mrt-audit b/mrt-services/audit/mrt-audit index f087850..f56d40b 160000 --- a/mrt-services/audit/mrt-audit +++ b/mrt-services/audit/mrt-audit @@ -1 +1 @@ -Subproject commit f087850ae825a8d3197801c2524729f35d3d3aa6 +Subproject commit f56d40b23862933316a3229cf56f0b05f31eb66c diff --git a/mrt-services/inventory/mrt-inventory b/mrt-services/inventory/mrt-inventory index 8c2ee6e..15ef9a9 160000 --- a/mrt-services/inventory/mrt-inventory +++ b/mrt-services/inventory/mrt-inventory @@ -1 +1 @@ -Subproject commit 8c2ee6e07052c6b769f1391bb3e745be9489a172 +Subproject commit 15ef9a92233e0a482675bd053839dbc6f3e9dacf diff --git a/mrt-services/replic/mrt-replic b/mrt-services/replic/mrt-replic index 2c4a26d..e3c9024 160000 --- a/mrt-services/replic/mrt-replic +++ b/mrt-services/replic/mrt-replic @@ -1 +1 @@ -Subproject commit 2c4a26d4de509c52e7275f8827ead7bb70261d28 +Subproject commit e3c90246d3b682ed2330ac820b9f9c0ed85de98a diff --git a/mrt-services/store/mrt-store b/mrt-services/store/mrt-store index 22244d1..e7067d5 160000 --- a/mrt-services/store/mrt-store +++ b/mrt-services/store/mrt-store @@ -1 +1 @@ -Subproject commit 22244d17f66538c5d1d4a382f7dec4cb88fb6d2e +Subproject commit e7067d5c3e6b5a0fd920ac31c6e955f2144a8678 From ce65e3cca9874543c5181868217aba1cab7a1456 Mon Sep 17 00:00:00 2001 From: Terry Brady Date: Wed, 24 Jul 2024 15:46:38 -0700 Subject: [PATCH 3/4] docker work --- mrt-services/docker-compose.yml | 10 ++-------- mrt-services/ingest/mrt-ingest | 2 +- mrt-services/ui/.dockerignore | 1 - mrt-services/ui/Dockerfile | 1 + 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/mrt-services/docker-compose.yml b/mrt-services/docker-compose.yml index 11dfc38..a4aab3b 100644 --- a/mrt-services/docker-compose.yml +++ b/mrt-services/docker-compose.yml @@ -28,14 +28,7 @@ services: SERVICE: ingest HOSTNAME: ingest LOGLEVEL: info - BatchConsumerDaemon: 1 - BatchReportConsumerDaemon: 1 - EstimateConsumerDaemon: 1 - ProvisionConsumerDaemon: 1 - DownloadConsumerDaemon: 1 - ProcessConsumerDaemon: 1 - RecordConsumerDaemon: 1 - NotifyConsumerDaemon: 1 + CATALINA_OPTS: "-DBatchConsumerDaemon=-1 -DBatchReportConsumerDaemon=-1 -DEstimateConsumerDaemon=1 -DProvisionConsumerDaemon=1 -DDownloadConsumerDaemon=1 -DProcessConsumerDaemon=1 -DRecordConsumerDaemon=1 -DNotifyConsumerDaemon=1" networks: merrittnet: ports: @@ -73,6 +66,7 @@ services: SERVICE: store HOSTNAME: store LOGLEVEL: info + CATALINA_OPTS: "-DAccessDaemon=1" networks: merrittnet: aliases: diff --git a/mrt-services/ingest/mrt-ingest b/mrt-services/ingest/mrt-ingest index 982f525..44f2fd2 160000 --- a/mrt-services/ingest/mrt-ingest +++ b/mrt-services/ingest/mrt-ingest @@ -1 +1 @@ -Subproject commit 982f5256d2860cfceb047ae7be9eb5db2ca3f609 +Subproject commit 44f2fd2b226d2247667ce2f1fd7228069facffab diff --git a/mrt-services/ui/.dockerignore b/mrt-services/ui/.dockerignore index 8ad9dff..e87cd16 100644 --- a/mrt-services/ui/.dockerignore +++ b/mrt-services/ui/.dockerignore @@ -6,5 +6,4 @@ mrt-dashboard/tmp/ mrt-dashboard/log/ mrt-dashboard/coverage/ mrt-dashboard/.bundle/ -mrt-dashboard/Gemfile.lock mrt-dashboard/public/assets \ No newline at end of file diff --git a/mrt-services/ui/Dockerfile b/mrt-services/ui/Dockerfile index af9b828..789ed7c 100644 --- a/mrt-services/ui/Dockerfile +++ b/mrt-services/ui/Dockerfile @@ -21,6 +21,7 @@ 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 From 19e73f7895e9f3d86b3e641fb9108d1a7d3a9bea Mon Sep 17 00:00:00 2001 From: Terry Brady Date: Wed, 24 Jul 2024 17:00:27 -0700 Subject: [PATCH 4/4] 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