Merge branch 'main' into add_timeScaleDb

trifork · Jan 2, 2024 · f6379ce · f6379ce
2 parents d500542 + 610401c
commit f6379ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/megalinter.yaml b/.github/workflows/megalinter.yaml
@@ -66,7 +66,7 @@ jobs:
 
       # Upload MegaLinter artifacts
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ success() }} || ${{ failure() }}
         with:
           name: MegaLinter reports

diff --git a/docker-compose/os.yaml b/docker-compose/os.yaml
@@ -5,13 +5,8 @@ services:
   # login fallback: admin:admin
   # services should use oauth
   opensearch:
-    image: ${DOCKER_REGISTRY-}cheetah-infrastructure-opensearch:latest
+    image: ${DOCKER_REGISTRY-}cheetah-infrastructure-opensearch:0.5.0
     hostname: opensearch
-    # build:
-    #    context: ./config/opensearch/
-    #    dockerfile: Dockerfile
-    #    args:
-    #      - OPENSEARCH_VERSION=2.6.0
     environment:
       - cluster.name=opensearch-cluster
       - node.name=os01
@@ -58,7 +53,7 @@ services:
       retries: 5
 
   opensearch-configurer:
-    image: ${DOCKER_REGISTRY-}cheetah-infrastructure-utils-os:latest
+    image: ${DOCKER_REGISTRY-}cheetah-infrastructure-utils-os:0.5.0
     command: "opensearch:9200 --service"
     environment:
       - OS_USER=admin
@@ -80,7 +75,7 @@ services:
 
   # login kibanaserver:kibanaserver
   opensearch-dashboards:
-    image: opensearchproject/opensearch-dashboards:2.6.0
+    image: opensearchproject/opensearch-dashboards:2.11.1
     hostname: opensearch-dashboards
     ports:
       - 5602:5601