mirror of https://github.com/docker/compose.git
update alpine version to 3.10.1
Signed-off-by: aiordache <anca.iordache@docker.com>
This commit is contained in:
parent
cf3c07d6ee
commit
60dcf87cc0
|
@ -2,7 +2,7 @@ ARG DOCKER_VERSION=18.09.7
|
|||
ARG PYTHON_VERSION=3.7.4
|
||||
ARG BUILD_ALPINE_VERSION=3.10
|
||||
ARG BUILD_DEBIAN_VERSION=slim-stretch
|
||||
ARG RUNTIME_ALPINE_VERSION=3.10.0
|
||||
ARG RUNTIME_ALPINE_VERSION=3.10.1
|
||||
ARG RUNTIME_DEBIAN_VERSION=stretch-20190708-slim
|
||||
|
||||
ARG BUILD_PLATFORM=alpine
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM s390x/alpine:3.6
|
||||
FROM s390x/alpine:3.10.1
|
||||
|
||||
ARG COMPOSE_VERSION=1.16.1
|
||||
|
||||
|
|
|
@ -360,7 +360,7 @@ class CLITestCase(DockerClientTestCase):
|
|||
'services': {
|
||||
'web': {
|
||||
'command': 'echo uwu',
|
||||
'image': 'alpine:3.4',
|
||||
'image': 'alpine:3.10.1',
|
||||
'ports': ['3341/tcp', '4449/tcp']
|
||||
}
|
||||
},
|
||||
|
@ -559,7 +559,7 @@ class CLITestCase(DockerClientTestCase):
|
|||
'services': {
|
||||
'foo': {
|
||||
'command': '/bin/true',
|
||||
'image': 'alpine:3.7',
|
||||
'image': 'alpine:3.10.1',
|
||||
'scale': 3,
|
||||
'restart': 'always:7',
|
||||
'mem_limit': '300M',
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
version: '3.5'
|
||||
services:
|
||||
foo:
|
||||
image: alpine:3.7
|
||||
image: alpine:3.10.1
|
||||
command: /bin/true
|
||||
deploy:
|
||||
replicas: 3
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
IMAGE=alpine:3.4
|
||||
IMAGE=alpine:3.10.1
|
||||
COMMAND=echo uwu
|
||||
PORT1=3341
|
||||
PORT2=4449
|
||||
|
|
|
@ -2,17 +2,17 @@ version: "2"
|
|||
|
||||
services:
|
||||
web:
|
||||
image: alpine:3.7
|
||||
image: alpine:3.10.1
|
||||
command: top
|
||||
networks: ["front"]
|
||||
app:
|
||||
image: alpine:3.7
|
||||
image: alpine:3.10.1
|
||||
command: top
|
||||
networks: ["front", "back"]
|
||||
links:
|
||||
- "db:database"
|
||||
db:
|
||||
image: alpine:3.7
|
||||
image: alpine:3.10.1
|
||||
command: top
|
||||
networks: ["back"]
|
||||
|
||||
|
|
|
@ -3620,7 +3620,7 @@ class InterpolationTest(unittest.TestCase):
|
|||
'version': '3.5',
|
||||
'services': {
|
||||
'foo': {
|
||||
'image': 'alpine:3.7',
|
||||
'image': 'alpine:3.10.1',
|
||||
'deploy': {
|
||||
'replicas': 3,
|
||||
'restart_policy': {
|
||||
|
@ -3646,7 +3646,7 @@ class InterpolationTest(unittest.TestCase):
|
|||
|
||||
service_dict = cfg.services[0]
|
||||
assert service_dict == {
|
||||
'image': 'alpine:3.7',
|
||||
'image': 'alpine:3.10.1',
|
||||
'scale': 3,
|
||||
'restart': {'MaximumRetryCount': 7, 'Name': 'always'},
|
||||
'mem_limit': '300M',
|
||||
|
|
Loading…
Reference in New Issue