diff --git a/api/go.mod b/api/go.mod index d5bf601da..a73400121 100644 --- a/api/go.mod +++ b/api/go.mod @@ -35,7 +35,7 @@ require ( github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 - github.com/portainer/docker-compose-wrapper v0.0.0-20221215210951-2c30d1b17a27 + github.com/portainer/docker-compose-wrapper v0.0.0-20221221110420-81b7f92b10f6 github.com/portainer/libcrypto v0.0.0-20220506221303-1f4fb3b30f9a github.com/portainer/libhttp v0.0.0-20221121135534-76f46e09c9a9 github.com/portainer/portainer/pkg/libhelm v0.0.0-20221201012749-4fee35924724 diff --git a/api/go.sum b/api/go.sum index d4d539da7..1dad0eabb 100644 --- a/api/go.sum +++ b/api/go.sum @@ -336,10 +336,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/portainer/docker-compose-wrapper v0.0.0-20221122145319-915b021aea84 h1:d1P8i0pCPvAfxH6nSLUFm6NYoi8tMrIpafaZXSV8Lac= -github.com/portainer/docker-compose-wrapper v0.0.0-20221122145319-915b021aea84/go.mod h1:03UmPLyjiPUexGJuW20mQXvmsoSpeErvMlItJGtq/Ww= -github.com/portainer/docker-compose-wrapper v0.0.0-20221215210951-2c30d1b17a27 h1:PceCpp86SDYb3lZHT4KpuBCkmcJMW5x1qrdFNEfAdUo= -github.com/portainer/docker-compose-wrapper v0.0.0-20221215210951-2c30d1b17a27/go.mod h1:03UmPLyjiPUexGJuW20mQXvmsoSpeErvMlItJGtq/Ww= +github.com/portainer/docker-compose-wrapper v0.0.0-20221221110420-81b7f92b10f6 h1:snz3ijUiKAwFEUKJ1BKzLcbQKxOZgDvZI+E8cusOrYw= +github.com/portainer/docker-compose-wrapper v0.0.0-20221221110420-81b7f92b10f6/go.mod h1:03UmPLyjiPUexGJuW20mQXvmsoSpeErvMlItJGtq/Ww= github.com/portainer/libcrypto v0.0.0-20220506221303-1f4fb3b30f9a h1:B0z3skIMT+OwVNJPQhKp52X+9OWW6A9n5UWig3lHBJk= github.com/portainer/libcrypto v0.0.0-20220506221303-1f4fb3b30f9a/go.mod h1:n54EEIq+MM0NNtqLeCby8ljL+l275VpolXO0ibHegLE= github.com/portainer/libhttp v0.0.0-20221121135534-76f46e09c9a9 h1:L7o0L+1qq+LzKjzgRB6bDIh5ZrZ5A1oSS+WgWzDgJIo= diff --git a/mustache-templates/upgrade-docker.yml.mustache b/mustache-templates/upgrade-docker.yml.mustache index 5b931b01f..d35b5dc2c 100644 --- a/mustache-templates/upgrade-docker.yml.mustache +++ b/mustache-templates/upgrade-docker.yml.mustache @@ -8,10 +8,8 @@ services: "--env-type", "{{envType}}{{^envType}}standalone{{/envType}}", "--license", "{{license}}" ] - {{#skip_pull_image}} environment: - - SKIP_PULL=1 - {{/skip_pull_image}} + - SKIP_PULL={{skip_pull_image}}{{^skip_pull_image}}0{{/skip_pull_image}} volumes: - /var/run/docker.sock:/var/run/docker.sock {{! - \\.\pipe\docker_engine:\\.\pipe\docker_engine }} \ No newline at end of file