Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Production deployment plus updates #124

Merged
merged 4 commits into from
Apr 10, 2024
Merged

Production deployment plus updates #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31edbc9
update for prod deployment with tmp url
orangewolf Apr 10, 2024
0e5cc3a
more changes from original prod
orangewolf Apr 10, 2024
a6e026f
Merge branch 'production_deployment' into production_deployment_plus_…
orangewolf Apr 10, 2024
81c7215
remove secret
orangewolf Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/helm_deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ DEPLOY_TAG="${DEPLOY_TAG:-latest}"
WORKER_TAG="${WORKER_TAG:-$DEPLOY_TAG}"
echo $DEPLOY_TAG

helm pull --untar oci://ghcr.io/samvera/hyrax/hyrax-helm --version 0.22.0

CHART_VERSION="${CHART_VERSION:-2.0.0}"
helm pull --untar oci://ghcr.io/samvera/charts/hyrax --version $CHART_VERSION
helm repo update

helm upgrade \
Expand Down
8 changes: 8 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ x-app: &app
# This line is what makes the knapsack include use the local code instead of the remote gem
- BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
- BUNDLE_DISABLE_LOCAL_BRANCH_CHECK=true
- BUNDLE_BUNDLER_INJECT__GEM_PATH=/app/samvera/bundler.d
- HYRAX_ACTIVE_JOB_QUEUE=good_job
volumes:
- node_modules:/app/samvera/hyrax-webapp/node_modules:cached
Expand Down Expand Up @@ -58,6 +59,13 @@ services:
file: hyrax-webapp/docker-compose.yml
service: db

base:
extends:
file: hyrax-webapp/docker-compose.yml
service: base
image: ghcr.io/samvera/hyku/base:${TAG:-latest}
command: bash -l -c "echo 'base is only used for building base images, which in turn reduces image build times. It does not need to be run'"

web:
<<: *app
extends:
Expand Down
Loading
Loading