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.

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

Adds compose v2 and v1 support #26

Open
wants to merge 14 commits into
base: master
Choose a base branch
from

Conversation

gonzalochief
Copy link

Please reject the changes to the main.yaml file. Those changes do not affect the functionality. the change was made for testing purposes.
the rest is OK and tested.

@@ -15,7 +15,7 @@ jobs:
with:
fetch-depth: 1
- name: Start Deployment
uses: wshihadeh/docker-deployment-action@master
uses: gonzalochief/docker-deployment-action@master

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you change this?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To test the fork

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please reset this and push it again?

@@ -29,7 +29,7 @@ jobs:
args: -p test up -d

- name: Start Deployment without copy
uses: wshihadeh/docker-deployment-action@master
uses: gonzalochief/docker-deployment-action@master

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

??

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To test the fork

Comment on lines +61 to +69
if [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v2" ]; then
DOCKER_COMP_COMMAND="docker compose"
elif [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v1" ]; then
DOCKER_COMP_COMMAND="docker-compose"
else
DOCKER_COMP_COMMAND="docker compose"
fi


Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v2" ]; then
DOCKER_COMP_COMMAND="docker compose"
elif [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v1" ]; then
DOCKER_COMP_COMMAND="docker-compose"
else
DOCKER_COMP_COMMAND="docker compose"
fi
DOCKER_COMP_COMMAND="docker compose"
if [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v1" ]; then
DOCKER_COMP_COMMAND="docker-compose"
fi

@wshihadeh
Copy link
Owner

can you reset the main.yaml file

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants