diff --git a/docs/roles/deploy_container.md b/docs/roles/deploy_container.md index e34d028c..9730b01e 100644 --- a/docs/roles/deploy_container.md +++ b/docs/roles/deploy_container.md @@ -18,9 +18,9 @@ AWS ECR registries require the AWS CLI user provided for `ce-deploy` to have the ```yaml --- deploy_container: - container_name: "example/example" + container_name: example container_tag: latest # tag will take format container_name:container_tag - docker_registry_url: https://index.docker.io/v1/ + docker_registry_name: index.docker.io/example # combines with container_name to make the full registry name, docker_registry_name/container_name docker_registry_user: example docker_registry_pass: asdf1234 docker_base_command: "docker image build" diff --git a/roles/deploy_container/README.md b/roles/deploy_container/README.md index e34d028c..9730b01e 100644 --- a/roles/deploy_container/README.md +++ b/roles/deploy_container/README.md @@ -18,9 +18,9 @@ AWS ECR registries require the AWS CLI user provided for `ce-deploy` to have the ```yaml --- deploy_container: - container_name: "example/example" + container_name: example container_tag: latest # tag will take format container_name:container_tag - docker_registry_url: https://index.docker.io/v1/ + docker_registry_name: index.docker.io/example # combines with container_name to make the full registry name, docker_registry_name/container_name docker_registry_user: example docker_registry_pass: asdf1234 docker_base_command: "docker image build" diff --git a/roles/deploy_container/defaults/main.yml b/roles/deploy_container/defaults/main.yml index 77fedec4..3578e12a 100644 --- a/roles/deploy_container/defaults/main.yml +++ b/roles/deploy_container/defaults/main.yml @@ -1,9 +1,8 @@ --- deploy_container: - container_name: "example/example" + container_name: example container_tag: latest # tag will take format container_name:container_tag - docker_registry_name: index.docker.io - docker_registry_url: https://index.docker.io/v1/ + docker_registry_name: index.docker.io/example # combines with container_name to make the full registry name, docker_registry_name/container_name docker_registry_user: example docker_registry_pass: asdf1234 docker_base_command: "docker image build" diff --git a/roles/deploy_container/tasks/main.yml b/roles/deploy_container/tasks/main.yml index f8984bcc..c58bb8b1 100644 --- a/roles/deploy_container/tasks/main.yml +++ b/roles/deploy_container/tasks/main.yml @@ -44,8 +44,7 @@ community.docker.docker_image: build: path: "{{ deploy_container.docker_build_dir }}" - repository: "{{ deploy_container.docker_registry_name }}" - name: "{{ deploy_container.container_name }}" + name: "{{ deploy_container.docker_registry_name }}/{{ deploy_container.container_name }}" tag: "{{ deploy_container.container_tag | default('latest') }}" push: true source: build