Undo running koppie/sirenia from hyrax-koppie dir

samvera · Dec 20, 2024 · 60da0fe · 60da0fe
1 parent 056346f
commit 60da0fe
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 36 deletions.
diff --git a/.koppie/.env b/.koppie/.env
@@ -14,9 +14,9 @@ DB_USERNAME=hyrax_user
 FCREPO_URL=http://fedoraAdmin:fedoraAdmin@fcrepo:8080/fcrepo/rest
 FITS_SERVLET_URL=http://fits:8080/fits
 HUB_URL=http://chrome:4444/wd/hub
-HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-koppie/derivatives/
+HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
 HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
-HYRAX_UPLOAD_PATH=/app/samvera/hyrax-koppie/uploads/
+HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
 HYRAX_VALKYRIE=true
 IN_DOCKER=true
 KARMA_BROWSER=remote-chromium
@@ -29,7 +29,7 @@ POSTGRES_PASSWORD=hyrax_password
 POSTGRES_USER=hyrax_user
 RACK_ENV=development
 RAILS_ENV=development
-RAILS_ROOT=/app/samvera/hyrax-koppie
+RAILS_ROOT=/app/samvera/hyrax-webapp
 RAILS_LOG_TO_STDOUT=false
 RAILS_QUEUE=sidekiq
 REDIS_HOST=redis

diff --git a/Dockerfile b/Dockerfile
@@ -98,12 +98,10 @@ ARG BUNDLE_WITHOUT=
 ENV HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
 
 COPY --chown=1001:101 .dassie /app/samvera/hyrax-webapp
-COPY --chown=1001:101 .koppie /app/samvera/hyrax-koppie
 COPY --chown=1001:101 . /app/samvera/hyrax-engine
 
 RUN bundle -v && \
   BUNDLE_GEMFILE=Gemfile.dassie bundle install --jobs "$(nproc)" && yarn && \
-  cd ../hyrax-koppie && BUNDLE_GEMFILE=Gemfile.koppie bundle install --jobs "$(nproc)" && yarn && \
   cd $HYRAX_ENGINE_PATH && bundle install --jobs "$(nproc)" && yarn && \
   yarn cache clean
 

diff --git a/bin/dev-entrypoint.sh b/bin/dev-entrypoint.sh
@@ -10,6 +10,7 @@ RUBY_MAJOR=$(ruby -e "puts /^(?'major'\d+)\.(?'minor'\d+)\.(?'patch'\d+)/.match(
 mkdir -p /app/bundle/ruby/$RUBY_MAJOR.0
 cp -Rn /usr/local/bundle/* /app/bundle/ruby/$RUBY_MAJOR.0
 bundle install
+yarn install
 
 db-migrate-seed.sh
 

diff --git a/docker-compose-koppie.yml b/docker-compose-koppie.yml
@@ -9,15 +9,14 @@ services:
         - EXTRA_APK_PACKAGES=git less
         - BUNDLE_GEMFILE=Gemfile.koppie
     image: samvera/hyrax-dev
-    working_dir: /app/samvera/hyrax-koppie
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
     user: root
     env_file:
       - .koppie/.env
     environment:
-      - RAILS_ROOT=/app/samvera/hyrax-koppie
+      - RAILS_ROOT=/app/samvera/hyrax-webapp
     depends_on:
       - worker
       - chrome
@@ -32,20 +31,19 @@ services:
       - 1049:1048
     volumes:
       - ./bin:/app/samvera
-      - .koppie:/app/samvera/hyrax-koppie
+      - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
       - bundle:/app/bundle
-      - hyrax-storage:/app/samvera/hyrax-koppie/storage
-      - hyrax-derivatives:/app/samvera/hyrax-koppie/derivatives
-      - hyrax-uploads:/app/samvera/hyrax-koppie/uploads
-      - rails-public:/app/samvera/hyrax-koppie/public
-      - rails-tmp:/app/samvera/hyrax-koppie/tmp
+      - hyrax-storage:/app/samvera/hyrax-webapp/storage
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
       - koppie
 
   worker:
     image: samvera/hyrax-dev
-    working_dir: /app/samvera/hyrax-koppie
     entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root
@@ -59,14 +57,14 @@ services:
       - solr
     volumes:
       - ./bin:/app/samvera
-      - .koppie:/app/samvera/hyrax-koppie
+      - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
       - bundle:/app/bundle
-      - hyrax-storage:/app/samvera/hyrax-koppie/storage
-      - hyrax-derivatives:/app/samvera/hyrax-koppie/derivatives
-      - hyrax-uploads:/app/samvera/hyrax-koppie/uploads
-      - rails-public:/app/samvera/hyrax-koppie/public
-      - rails-tmp:/app/samvera/hyrax-koppie/tmp
+      - hyrax-storage:/app/samvera/hyrax-webapp/storage
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
       - koppie
 

diff --git a/docker-compose-sirenia.yml b/docker-compose-sirenia.yml
@@ -9,7 +9,6 @@ services:
         - EXTRA_APK_PACKAGES=git less
         - BUNDLE_GEMFILE=Gemfile.koppie
     image: samvera/hyrax-dev
-    working_dir: /app/samvera/hyrax-koppie
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
@@ -18,7 +17,7 @@ services:
       - .koppie/.env
     environment:
       - APP_NAME=sirenia
-      - RAILS_ROOT=/app/samvera/hyrax-koppie
+      - RAILS_ROOT=/app/samvera/hyrax-webapp
       - VALKYRIE_METADATA_ADAPTER=fedora_metadata
       - VALKYRIE_STORAGE_ADAPTER=fedora_storage
     depends_on:
@@ -35,28 +34,27 @@ services:
       - 1050:1048
     volumes:
       - ./bin:/app/samvera
-      - .koppie:/app/samvera/hyrax-koppie
+      - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
       - bundle:/app/bundle
-      - hyrax-storage:/app/samvera/hyrax-koppie/storage
-      - hyrax-derivatives:/app/samvera/hyrax-koppie/derivatives
-      - hyrax-uploads:/app/samvera/hyrax-koppie/uploads
-      - rails-public:/app/samvera/hyrax-koppie/public
-      - rails-tmp:/app/samvera/hyrax-koppie/tmp
+      - hyrax-storage:/app/samvera/hyrax-webapp/storage
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
       - sirenia
 
   worker:
     image: samvera/hyrax-dev
-    working_dir: /app/samvera/hyrax-koppie
     entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root
     env_file:
       - .koppie/.env
     environment:
       - APP_NAME=sirenia
-      - RAILS_ROOT=/app/samvera/hyrax-koppie
+      - RAILS_ROOT=/app/samvera/hyrax-webapp
       - VALKYRIE_METADATA_ADAPTER=fedora_metadata
       - VALKYRIE_STORAGE_ADAPTER=fedora_storage
     depends_on:
@@ -67,14 +65,14 @@ services:
       - solr
     volumes:
       - ./bin:/app/samvera
-      - .koppie:/app/samvera/hyrax-koppie
+      - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
       - bundle:/app/bundle
-      - hyrax-storage:/app/samvera/hyrax-koppie/storage
-      - hyrax-derivatives:/app/samvera/hyrax-koppie/derivatives
-      - hyrax-uploads:/app/samvera/hyrax-koppie/uploads
-      - rails-public:/app/samvera/hyrax-koppie/public
-      - rails-tmp:/app/samvera/hyrax-koppie/tmp
+      - hyrax-storage:/app/samvera/hyrax-webapp/storage
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
       - sirenia