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.

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

Some Build Adjustments #1946

Merged
merged 3 commits into from
Jun 23, 2023
Merged

Some Build Adjustments #1946

merged 3 commits into from
Jun 23, 2023

Conversation

orangewolf
Copy link
Member

  • fill in java_opts by default
  • remove need for sed now that ruby is fixed in hyrax image
  • update hyrax-doi branch to main as hyrax_upgrade is merged

@samvera/hyku-code-reviewers

…xed in hyrax image. update hyrax-doi branch to main
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2023_02_08_001228) do
ActiveRecord::Schema.define(version: 2023_01_31_202855) do
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why revert the schema?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dont see a migration here. I dont know how the schema got rolled forward but the number seems wrong

@@ -13,6 +13,7 @@ FCREPO_PORT=8080
FCREPO_REST_PATH=rest
[email protected]
INITIAL_ADMIN_PASSWORD=testing123
JAVA_OPTS=-Xmx4g -Xms1g
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this include a space?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it needs the space

docker-compose.yml Outdated Show resolved Hide resolved
@orangewolf orangewolf merged commit 16a1f95 into main Jun 23, 2023
@orangewolf orangewolf deleted the build_adjustments branch June 23, 2023 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants