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

Updating docker commands #153

Merged
merged 2 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/workflows/elastic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Starting ElasticSearch
run: docker-compose -f docker/sas-elastic/docker-compose.yml --project-directory . up -d elastic
run: docker compose -f docker/sas-elastic/compose.yaml --project-directory . up -d elastic
- name: Wait for Elastic to start
run: .github/bin/waitHttp.sh "http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=50s"
- name: Run Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/solr-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v2

- name: Starting SOLR
run: docker-compose -f docker/sas-solr-cloud/docker-compose.yml --project-directory . up -d
run: docker compose -f docker/sas-solr-cloud/compose.yaml --project-directory . up -d

- name: Wait for SOLR to start
run: docker exec -t solr1 /opt/docker-solr/scripts/wait-for-solr.sh --max-attempts 10 --wait-seconds 5 --solr-url http://0.0.0.0:8983/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/solr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Starting SOLR
run: mkdir solr-data && chmod 777 solr-data && docker-compose -f docker/sas-solr/docker-compose.yml --project-directory . up -d solr
run: mkdir solr-data && chmod 777 solr-data && docker compose -f docker/sas-solr/compose.yaml --project-directory . up -d solr

- name: checking docker
run: docker ps && docker logs sas_solr
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void testWorkshopManifest() throws IOException, IDConflictException, Malf

@Test
public void test30Manifest() throws IOException, IDConflictException, MalformedAnnotation {
Map<String, Object> tManifestJson = (Map<String,Object>)JsonUtils.fromInputStream(new FileInputStream(getClass().getResource("/jsonld/manifests/3.0manifest.json").getFile()));
Map<String, Object> tManifestJson = (Map<String,Object>)JsonUtils.fromInputStream(new FileInputStream(getClass().getResource("/jsonld/3.0/manifests/0001-mvm-image.json").getFile()));

String tShortId = "short_id";
try {
Expand Down
Loading