Skip to content

correct support images while testing (solr) #534

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

Merged
MajoBerger merged 13 commits into from
Mar 4, 2024
Merged

correct support images while testing (solr) #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
63997d2
our BE versions of images
MajoBerger Mar 4, 2024
edf0afd
tmp comment to speed up testing
MajoBerger Mar 4, 2024
f802cb7
tmp debug and INSTANCE
MajoBerger Mar 4, 2024
fa9650a
more debug, corrected isntance NO
MajoBerger Mar 4, 2024
a0854fa
correct INSTANCE and correct container logs
MajoBerger Mar 4, 2024
bd875fb
postgres password
MajoBerger Mar 4, 2024
a9a037a
localhost instead of 127
MajoBerger Mar 4, 2024
5add720
maybe just wait
MajoBerger Mar 4, 2024
8fa7725
different pg image
MajoBerger Mar 4, 2024
8a80ff5
back to 127
MajoBerger Mar 4, 2024
5272a06
remove unnecessary restart
MajoBerger Mar 4, 2024
d2321e4
semifinal version
MajoBerger Mar 4, 2024
4af6fcd
merge-ready
MajoBerger Mar 4, 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
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ jobs:
# The ci step will test the dspace-angular code against DSpace REST.
# Direct that step to utilize a DSpace REST service that has been started in docker.
# Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 18+
INSTANCE: '2'
DSPACE_CI_IMAGE: 'dataquest/dspace:dspace-7_x-test'
DSPACE_SOLR_IMAGE: dataquest/dspace-solr:dspace-7_x
DSPACE_REST_HOST: 127.0.0.1
DSPACE_REST_PORT: 8080
DSPACE_REST_NAMESPACE: '/server'
Expand Down
5 changes: 2 additions & 3 deletions docker/docker-compose-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ services:
# This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
LOADSQL: https://github.com/dataquest-dev/DSpace/releases/download/data/dspace-test-database-dump_29.1.2024.sql
PGDATA: /pgdata
image: dspace/dspace-postgres-pgcrypto:loadsql
image: ${DSPACE_DB_IMAGE:-dspace/dspace-postgres-pgcrypto:loadsql}
networks:
dspacenet:
stdin_open: true
Expand All @@ -79,8 +79,7 @@ services:
# DSpace Solr container
dspacesolr:
container_name: dspacesolr
# Uses official Solr image at https://hub.docker.com/_/solr/
image: solr:8.11
image: ${DSPACE_SOLR_IMAGE:-dataquest/dspace-solr:dspace-7_x}
# Needs main 'dspace' container to start first to guarantee access to solr_configs
depends_on:
- dspace
Expand Down