Skip to content

ESB-513 Renamed docker-compose in docker compose for v2 version #30

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

Merged
eliamezzano merged 1 commit into from
Oct 29, 2025
Merged

ESB-513 Renamed docker-compose in docker compose for v2 version #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/github-test-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
java-version: 11
- name: "Cache Maven packages"
if: steps.GATE.outputs.ENABLED == 'true'
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion install/github/enp/workflows/ga-publication.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
--id "CHECKOUT FOR GA PUBLICATION" \
--lcd "$LOCAL_CLONE_DIR"
- name: "Cache Maven packages"
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion install/github/enp/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
#~ BUILD CACHE
- name: "Cache Build Dir"
id: build-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: "${{ env.LOCAL_CLONE_DIR}}/${{ env.BUILD_TARGET_DIR }}/"
key: "${{ runner.os }}-enp-build-${{ env.BUILD_CACHE_KEY }}"
Expand Down
2 changes: 1 addition & 1 deletion install/github/enp/workflows/publication.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
#~ BUILD CACHE
#- name: "Cache Build Dir"
#id: build-cache
#uses: actions/cache@v2
#uses: actions/cache@v4
#with:
#path: "${{ env.LOCAL_CLONE_DIR}}/${{ env.BUILD_TARGET_DIR }}/"
#key: "${{ runner.os }}-enp-build-${{ env.BUILD_CACHE_KEY }}"
Expand Down
2 changes: 1 addition & 1 deletion install/github/mvn/workflows/ga-publication.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
--id "CHECKOUT FOR GA PUBLICATION" \
--lcd "$LOCAL_CLONE_DIR"
- name: "Cache Maven packages"
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
6 changes: 3 additions & 3 deletions install/github/mvn/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ jobs:
java-version: 11
#~ MAVEN CACHE
- name: "Cache Maven packages"
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2
restore-keys: ${{ runner.os }}-m2
#~ SONAR CACHE
- name: Cache SonarCloud packages
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
#~ MAVEN CACHE
- name: "Cache Maven packages"
id: maven-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-matrix-${{ matrix.scan-type }}
Expand Down
6 changes: 3 additions & 3 deletions install/github/mvn/workflows/publication.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
java-version: 11
#~ MAVEN CACHE
- name: "Cache Maven packages"
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
java-version: 11
#~ MAVEN CACHE
- name: "Cache Maven packages"
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
java-version: 11
#~ MAVEN CACHE
- name: "Cache Maven packages"
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2
Expand Down
2 changes: 1 addition & 1 deletion install/github/npm/workflows/ga-publication.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
--id "CHECKOUT FOR GA PUBLICATION" \
--lcd "$LOCAL_CLONE_DIR"
- name: "Cache Maven packages"
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
4 changes: 2 additions & 2 deletions install/github/npm/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
#~ NPM CACHE
- name: "Cache NPM Packages"
id: package-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-npm
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
#~ NPM CACHE
- name: "Cache NPM Packages"
id: package-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-npm
Expand Down
4 changes: 2 additions & 2 deletions install/github/npm/workflows/publication.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
#~ NPM CACHE
- name: "Cache NPM Packages"
id: package-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-npm
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
#~ NPM CACHE
- name: "Cache NPM Packages"
id: package-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-npm
Expand Down
6 changes: 3 additions & 3 deletions macro/agnostic/mvn.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ ppl--mvn.run-plan() {
;;
"COMPOSE-UP")
if [ -n "$ENTANDO_OPT_TEST_COMPOSE_FILE" ] && [ -f "$ENTANDO_OPT_TEST_COMPOSE_FILE" ]; then
docker-compose -f "$ENTANDO_OPT_TEST_COMPOSE_FILE" up -d 2>&1 | _summarize_stream --ppl-pg 500 "COMPOSE-UP"
docker compose -f "$ENTANDO_OPT_TEST_COMPOSE_FILE" up -d 2>&1 | _summarize_stream --ppl-pg 500 "COMPOSE-UP"
_SOE --pipe 0
fi
;;
"COMPOSE-DOWN")
if [ -n "$ENTANDO_OPT_TEST_COMPOSE_FILE" ] && [ -f "$ENTANDO_OPT_TEST_COMPOSE_FILE" ]; then
docker-compose -f "$ENTANDO_OPT_TEST_COMPOSE_FILE" down -d 2>&1 | _summarize_stream --ppl-pg 500 "COMPOSE-DOWN"
docker compose -f "$ENTANDO_OPT_TEST_COMPOSE_FILE" down -d 2>&1 | _summarize_stream --ppl-pg 500 "COMPOSE-DOWN"
fi
;;
"OKD-LOGIN")
Expand Down Expand Up @@ -205,7 +205,7 @@ ppl--mvn.full-build() {
_SOE

if [ -n "$ENTANDO_OPT_TEST_COMPOSE_FILE" ]; then
docker-compose -f "$ENTANDO_OPT_TEST_COMPOSE_FILE" down 2>&1 | _summarize_stream --ppl-pg 500 "COMPOSE-DOWN"
docker compose -f "$ENTANDO_OPT_TEST_COMPOSE_FILE" down 2>&1 | _summarize_stream --ppl-pg 500 "COMPOSE-DOWN"
else
true
fi
Expand Down
Loading