commit 43575ba13421005a3726e6032384e4ff23ee4031
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Dec 06 21:50:01 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Dec 06 21:50:01 2018 +0000
tree 6396ac1d9ac2e03e81b55ad3d0ab425ac7947fcb
parent 72be63d01232852c9620acafcc2c6000a7e53ed6
parent 7e4d32e15426db1ad7a1b225107e545d1fa05d16

Merge "Use aptly base image for aptly-api container"

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index fa13bdf..8b0b6a0 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -43,6 +43,5 @@
     # aptly
     docker_image_aptly:
       base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:mcp_version}"
-      api: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-api:${_param:mcp_version}"
       public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:${_param:mcp_version}"
       publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:${_param:mcp_version}"

docker/swarm/stack/aptly.yml

diff --git a/docker/swarm/stack/aptly.yml b/docker/swarm/stack/aptly.yml
index d5b8362..3282641 100644
--- a/docker/swarm/stack/aptly.yml
+++ b/docker/swarm/stack/aptly.yml
@@ -16,7 +16,8 @@
               deploy:
                 restart_policy:
                   condition: any
-              image: ${_param:docker_image_aptly:api}
+              image: ${_param:docker_image_aptly:base}
+              command: 'aptly api serve -no-lock'
               ports:
                 - 18084:8080
               volumes: