Updating Docker names and versions

glenrobson · Sep 9, 2024 · be2b932 · be2b932
1 parent 6fcb8f0
commit be2b932
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 3 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