Fix docker links & index patterns names (opensearch-project#2017)

* update wget command to create a local folder update java docker command * update wget command to create a local folder update java docker command update golang docker command (cherry picked from commit c258de2)
TackAdam · Jul 31, 2024 · 29cfaac · 29cfaac
1 parent fe16201
commit 29cfaac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/csv_file-1.0.0.json b/public/components/getting_started/getting_started_artifacts/csv_file/csv_file-1.0.0.json
@@ -98,7 +98,11 @@
             "phase": "docker",
             "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/getting-started/fluent-bit.yml"],
             "description": "Run docker-compose for the nginx live example and see the generated index",
+<<<<<<< HEAD
             "content": "wget -O fluent-bit.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/fluent-bit.yml && docker-compose -f fluent-bit.yml up -d\n"
+=======
+            "content": "wget -O docker-compose.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/docker-compose.yml && docker-compose up -d fluent-bit \n"
+>>>>>>> c258de2c (Fix docker links & index patterns names (#2017))
           }
         ]
       },

diff --git a/...mponents/getting_started/getting_started_artifacts/golang_client/golang_client-1.0.0.json b/...mponents/getting_started/getting_started_artifacts/golang_client/golang_client-1.0.0.json
@@ -118,7 +118,11 @@
             "phase": "docker",
             "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/docker-compose.yml"],
             "description": "Run docker-compose for the gloang-client live example and see the generated index",
+<<<<<<< HEAD
             "content": "wget -O docker-compose.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/docker-compose.yml && docker-compose up --build \n"
+=======
+            "content": "wget -O docker-compose.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/docker-compose.yml && docker compose up --build -d golang-app fluent-bit \n"
+>>>>>>> c258de2c (Fix docker links & index patterns names (#2017))
           }
         ]
       },

diff --git a/...c/components/getting_started/getting_started_artifacts/java_client/java_client-1.0.0.json b/...c/components/getting_started/getting_started_artifacts/java_client/java_client-1.0.0.json
@@ -94,7 +94,7 @@
               "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/src/main/java/App.java",
               "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/pom.xml"
             ],
-            "content": "wget https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/Dockerfile \\\n  https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/pom.xml \\\n  https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/src/main/java/App.java \n",
+            "content": "mkdir -p java-app/src/main/java\n\nwget -P java-app \\\n  https://raw.githubusercontent.com/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/java-app/Dockerfile\n\nwget -P java-app \\\n  https://raw.githubusercontent.com/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/java-app/pom.xml\n\nwget -P java-app/src/main/java \\\n  https://raw.githubusercontent.com/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/java-app/src/main/java/App.java\n",
             "description": "Setup docker-compose java-app service configuration "
           },
           {