Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaced docker-compose with docker compose in Makefile #847

Closed
wants to merge 3 commits into from
Closed

Replaced docker-compose with docker compose in Makefile #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ca77cd
Replaced `docker-compose` with `docker compose` in Makefile
nhtruong Aug 20, 2024
c9bbabd
#
nhtruong Aug 20, 2024
176dad5
#
nhtruong Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/integration-unreleased.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Assemble OpenSearch
if: steps.cache-restore.outputs.cache-hit != 'true'
working-directory: opensearch
run: ./gradlew :distribution:archives:linux-tar:assemble
run: ./gradlew :distribution:archives:linux-tar:assemble --gradle-version=8.9

- name: Save cached build
if: steps.cache-restore.outputs.cache-hit != 'true'
Expand All @@ -72,7 +72,7 @@ jobs:
fi
echo '=====> waiting...'
done
exit 1
exit 1

- name: Checkout Javascript Client
uses: actions/checkout@v3
Expand Down Expand Up @@ -100,4 +100,4 @@ jobs:
with:
name: opensearch-logs-${{ matrix.entry.opensearch_ref }}-js-${{ matrix.entry.node_version }}
path: |
opensearch/distribution/archives/linux-tar/build/distributions/**/logs/*
opensearch/distribution/archives/linux-tar/build/distributions/**/logs/*
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### Deprecated
### Removed
### Fixed
- Fixed docker-compose command in Makefile ([#845](https://github.com/opensearch-project/opensearch-js/issues/845))
### Security

## [2.11.0]
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cluster.opensearch.build:
docker-compose --project-directory .ci/opensearch build;
docker compose --project-directory .ci/opensearch build;

cluster.opensearch.start:
docker-compose --project-directory .ci/opensearch up -d ;
sleep 60;
docker compose --project-directory .ci/opensearch up -d ;
sleep 90;

cluster.opensearch.stop:
docker-compose --project-directory .ci/opensearch down ;
docker compose --project-directory .ci/opensearch down ;

cluster.clean: ## Remove unused Docker volumes and networks
@printf "\033[2m→ Cleaning up Docker assets...\033[0m\n"
Expand Down
Loading