From 9b7b8734a7a82af991682ae3f7b6931b5c9c1c21 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Mon, 7 Aug 2023 13:22:36 -0700 Subject: [PATCH 1/3] dont copy files in to docker until build of child --- Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8dcc29ec9..be593ae27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,15 +81,17 @@ COPY --chown=1001:101 ./ops/exiftool_image_to_fits.xslt /app/fits/xml/exiftool/e RUN ln -sf /usr/lib/libmediainfo.so.0 /app/fits/tools/mediainfo/linux/libmediainfo.so.0 && \ ln -sf /usr/lib/libzen.so.0 /app/fits/tools/mediainfo/linux/libzen.so.0 -FROM hyku-base as hyku-web +ONBUILD COPY --chown=1001:101 $APP_PATH/bin/db-migrate-seed.sh /app/samvera/ + +ONBUILD COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/ +ONBUILD RUN bundle install --jobs "$(nproc)" -COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/ -RUN bundle install --jobs "$(nproc)" +ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp -COPY --chown=1001:101 $APP_PATH/bin/db-migrate-seed.sh /app/samvera/ -COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp +ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install -RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install + +FROM hyku-base as hyku-web CMD ./bin/web FROM hyku-web as hyku-worker From 6fc7f62d884b7382e4637aae274b311f6f90e12b Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Sun, 6 Aug 2023 02:07:46 -0700 Subject: [PATCH 2/3] fix env --- .env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 69e77caec..4884c219b 100644 --- a/.env +++ b/.env @@ -32,10 +32,10 @@ SOLR_PORT=8983 SOLR_URL=http://solr:SolrRocks@solr:8983/solr/ # Comment out these 5 for single tenancy / Uncomment for multi -HYKU_ADMIN_HOST=local3000.notch8.cloud +HYKU_ADMIN_HOST=hyku.test HYKU_ADMIN_ONLY_TENANT_CREATION=false -HYKU_DEFAULT_HOST=%{tenant}.local3000.notch8.cloud -HYKU_ROOT_HOST=local3000.notch8.cloud +HYKU_DEFAULT_HOST=%{tenant}.hyku.test +HYKU_ROOT_HOST=hyku.test HYKU_MULTITENANT=true # Comment out these 2 for multi tenancy / Uncomment for single # HYKU_ROOT_HOST=hyku.test From 089a843dbea38ca1d187e1853ee59c7c6e8da3f8 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Sun, 6 Aug 2023 02:12:02 -0700 Subject: [PATCH 3/3] remove a few things --- app/assets/images/login_saml_logo.svg | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 app/assets/images/login_saml_logo.svg diff --git a/app/assets/images/login_saml_logo.svg b/app/assets/images/login_saml_logo.svg deleted file mode 100644 index 147e8f813..000000000 --- a/app/assets/images/login_saml_logo.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - login-gov-logo-lg - Created with Sketch. - - - - \ No newline at end of file