From be2b932a9fb63d5f78900f376654b7fda8f4cb36 Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Mon, 9 Sep 2024 11:59:27 +0100 Subject: [PATCH 1/2] Updating Docker names and versions --- .github/workflows/elastic.yml | 2 +- .github/workflows/solr-cloud.yml | 2 +- .github/workflows/solr.yml | 2 +- docker/sas-auth/{docker-compose.yml => compose.yaml} | 0 docker/sas-elastic/{docker-compose.yml => compose.yaml} | 0 docker/sas-solr-cloud/{docker-compose.yml => compose.yaml} | 0 docker/sas-solr/{docker-compose.yml => compose.yaml} | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename docker/sas-auth/{docker-compose.yml => compose.yaml} (100%) rename docker/sas-elastic/{docker-compose.yml => compose.yaml} (100%) rename docker/sas-solr-cloud/{docker-compose.yml => compose.yaml} (100%) rename docker/sas-solr/{docker-compose.yml => compose.yaml} (100%) diff --git a/.github/workflows/elastic.yml b/.github/workflows/elastic.yml index 7be9fa58..57e663dd 100644 --- 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 index c1a2e335..b8422c02 100644 --- 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 index 0ced5577..1125511d 100644 --- 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 b/docker/sas-auth/compose.yaml similarity index 100% rename from docker/sas-auth/docker-compose.yml rename to docker/sas-auth/compose.yaml diff --git a/docker/sas-elastic/docker-compose.yml b/docker/sas-elastic/compose.yaml similarity index 100% rename from docker/sas-elastic/docker-compose.yml rename to docker/sas-elastic/compose.yaml diff --git a/docker/sas-solr-cloud/docker-compose.yml b/docker/sas-solr-cloud/compose.yaml similarity index 100% rename from docker/sas-solr-cloud/docker-compose.yml rename to docker/sas-solr-cloud/compose.yaml diff --git a/docker/sas-solr/docker-compose.yml b/docker/sas-solr/compose.yaml similarity index 100% rename from docker/sas-solr/docker-compose.yml rename to docker/sas-solr/compose.yaml From 8b579dfdad4464e78b4f2d353ffc88a0c0883a73 Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Mon, 9 Sep 2024 12:03:08 +0100 Subject: [PATCH 2/2] Updating the location of the v3 manifests --- src/test/java/uk/org/llgc/annotation/store/test/TestModel.java | 2 +- .../3.0manifest.json => 3.0/manifests/0001-mvm-image.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/test/resources/jsonld/{manifests/3.0manifest.json => 3.0/manifests/0001-mvm-image.json} (100%) 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 index d15658b3..82e6595e 100644 --- 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 tManifestJson = (Map)JsonUtils.fromInputStream(new FileInputStream(getClass().getResource("/jsonld/manifests/3.0manifest.json").getFile())); + Map tManifestJson = (Map)JsonUtils.fromInputStream(new FileInputStream(getClass().getResource("/jsonld/3.0/manifests/0001-mvm-image.json").getFile())); String tShortId = "short_id"; try { diff --git a/src/test/resources/jsonld/manifests/3.0manifest.json b/src/test/resources/jsonld/3.0/manifests/0001-mvm-image.json similarity index 100% rename from src/test/resources/jsonld/manifests/3.0manifest.json rename to src/test/resources/jsonld/3.0/manifests/0001-mvm-image.json