Merge pull request #153 from glenrobson/support-v3

Updating docker commands
glenrobson · Sep 9, 2024 · a2b6a40 · a2b6a40
2 parents 6fcb8f0 + 8b579df
commit a2b6a40
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/elastic.yml b/.github/workflows/elastic.yml
@@ -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

diff --git a/.github/workflows/solr-cloud.yml b/.github/workflows/solr-cloud.yml
@@ -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/

diff --git a/.github/workflows/solr.yml b/.github/workflows/solr.yml
@@ -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

diff --git a/docker/sas-auth/docker-compose.yml → docker/sas-auth/compose.yaml b/docker/sas-auth/docker-compose.yml → docker/sas-auth/compose.yaml
diff --git a/docker/sas-elastic/docker-compose.yml → docker/sas-elastic/compose.yaml b/docker/sas-elastic/docker-compose.yml → docker/sas-elastic/compose.yaml
diff --git a/docker/sas-solr-cloud/docker-compose.yml → docker/sas-solr-cloud/compose.yaml b/docker/sas-solr-cloud/docker-compose.yml → docker/sas-solr-cloud/compose.yaml
diff --git a/docker/sas-solr/docker-compose.yml → docker/sas-solr/compose.yaml b/docker/sas-solr/docker-compose.yml → docker/sas-solr/compose.yaml
diff --git a/src/test/java/uk/org/llgc/annotation/store/test/TestModel.java b/src/test/java/uk/org/llgc/annotation/store/test/TestModel.java
@@ -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 {

diff --git a/...sources/jsonld/manifests/3.0manifest.json → .../jsonld/3.0/manifests/0001-mvm-image.json b/...sources/jsonld/manifests/3.0manifest.json → .../jsonld/3.0/manifests/0001-mvm-image.json