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

Ensure Docker Compose uses Runnable JAR (Angular) #2997

Merged
merged 2 commits into from
May 2, 2024

Conversation

tdonohue
Copy link
Member

@tdonohue tdonohue commented May 2, 2024

References

Description

Per the changes in DSpace/DSpace#9505, this PR updates the Docker Compose scripts in dspace-angular in the following ways:

  1. Updates all docker compose scripts to use Runnable JAR (similar to Fix Runnable JAR issues & use it in all Docker images DSpace#9505)
  2. Minor bug fixes to loadsql Docker Compose scripts as a followup to Update REST and CI docker compose scripts to sync with 8.0 backend #2966. These were noticed when I compared the Docker Compose scripts in DSpace/DSpace to those in DSpace/dspace-angular

@tdonohue tdonohue added 1 APPROVAL pull request only requires a single approval to merge backend: Docker related to DSpace deployment via Docker labels May 2, 2024
@tdonohue tdonohue added this to the 8.0 milestone May 2, 2024
@tdonohue tdonohue force-pushed the update_for_runnable_jar branch from decf3df to 2260eab Compare May 2, 2024 16:37
@tdonohue
Copy link
Member Author

tdonohue commented May 2, 2024

NOTE: Because this PR modifies docker-compose-ci.yml to use a Runnable JAR, all e2e tests will fail until DSpace/DSpace#9505 is merged. This is because the e2e tests will now utilize Docker Compose scripts that use the Runnable JAR instead of a Tomcat image.

@tdonohue
Copy link
Member Author

tdonohue commented May 2, 2024

Tests now pass because DSpace/DSpace#9505 was merged.

Merging this immediately, as these Docker Compose scripts will no longer work until this is merged.

@tdonohue tdonohue merged commit efdc357 into DSpace:main May 2, 2024
13 checks passed
@tdonohue tdonohue deleted the update_for_runnable_jar branch May 2, 2024 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1 APPROVAL pull request only requires a single approval to merge backend: Docker related to DSpace deployment via Docker
Projects
No open projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

1 participant