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

RD-7159-Fix-Docker-Install #106

Merged
merged 1 commit into from
May 15, 2023
Merged

RD-7159-Fix-Docker-Install #106

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
4 changes: 3 additions & 1 deletion CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@
2.0.10:
- Fix get api due to back-compat issue.
2.0.11:
- add __version__.py file in cloudify_docker folder.
- add __version__.py file in cloudify_docker folder.
2.0.12:
- fix install config for docker host.
2 changes: 1 addition & 1 deletion cloudify_docker/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = '2.0.11'
version = '2.0.12'
8 changes: 6 additions & 2 deletions cloudify_docker/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,12 @@ def list_images(ctx, docker_client, **kwargs):
def install_docker(ctx, **kwargs):
# fetch the data needed for installation
docker_ip, docker_user, docker_key, _ = get_docker_machine_from_ctx(ctx)
install_url = ctx.node.properties.get('install_url')
post_install_url = ctx.node.properties.get('install_script')
resource_config = ctx.node.properties.get('resource_config', {})
install_url = resource_config.get('install_url')
post_install_url = resource_config.get('install_script')

if not (install_url and post_install_url):
raise NonRecoverableError("Please validate your install config")

with get_fabric_settings(ctx, docker_ip, docker_user, docker_key) as s:
with s:
Expand Down
2 changes: 1 addition & 1 deletion plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins:
docker:
executor: central_deployment_agent
package_name: 'cloudify-docker-plugin'
package_version: '2.0.11'
package_version: '2.0.12'

dsl_definitions:

Expand Down
2 changes: 1 addition & 1 deletion plugin_1_4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins:
docker:
executor: central_deployment_agent
package_name: 'cloudify-docker-plugin'
package_version: '2.0.11'
package_version: '2.0.12'

dsl_definitions:

Expand Down
2 changes: 1 addition & 1 deletion v2_plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins:
docker:
executor: central_deployment_agent
package_name: 'cloudify-docker-plugin'
package_version: '2.0.11'
package_version: '2.0.12'

dsl_definitions:

Expand Down