Skip to content

Adds compose v2 and v1 support#26

Open
gonzalochief wants to merge 14 commits intowshihadeh:masterfrom
gonzalochief:master
Open

Adds compose v2 and v1 support#26
gonzalochief wants to merge 14 commits intowshihadeh:masterfrom
gonzalochief:master

Conversation

@gonzalochief
Copy link
Copy Markdown

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.

fetch-depth: 1
- name: Start Deployment
uses: wshihadeh/docker-deployment-action@master
uses: gonzalochief/docker-deployment-action@master
Copy link
Copy Markdown

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
Copy Markdown
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

Copy link
Copy Markdown

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?


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

Choose a reason for hiding this comment

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

??

Copy link
Copy Markdown
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 thread docker-entrypoint.sh
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


Copy link
Copy Markdown

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
Copy Markdown
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.

3 participants