tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

update alpine version to 3.10.1

Browse Source 
Signed-off-by: aiordache <anca.iordache@docker.com>
This commit is contained in:
aiordache 2019-08-19 17:30:28 +02:00
parent cf3c07d6ee
commit 60dcf87cc0
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -2,7 +2,7 @@ ARG DOCKER_VERSION=18.09.7
ARG PYTHON_VERSION=3.7.4 ARG PYTHON_VERSION=3.7.4
ARG BUILD_ALPINE_VERSION=3.10 ARG BUILD_ALPINE_VERSION=3.10
ARG BUILD_DEBIAN_VERSION=slim-stretch 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 RUNTIME_DEBIAN_VERSION=stretch-20190708-slim
ARG BUILD_PLATFORM=alpine ARG BUILD_PLATFORM=alpine

2
Dockerfile.s390x
View File

@ -1,4 +1,4 @@
FROM s390x/alpine:3.6 FROM s390x/alpine:3.10.1
ARG COMPOSE_VERSION=1.16.1 ARG COMPOSE_VERSION=1.16.1

4
tests/acceptance/cli_test.py
View File

@ -360,7 +360,7 @@ class CLITestCase(DockerClientTestCase):
'services': { 'services': {
'web': { 'web': {
'command': 'echo uwu', 'command': 'echo uwu',
'image': 'alpine:3.4', 'image': 'alpine:3.10.1',
'ports': ['3341/tcp', '4449/tcp'] 'ports': ['3341/tcp', '4449/tcp']
} }
}, },
@ -559,7 +559,7 @@ class CLITestCase(DockerClientTestCase):
'services': { 'services': {
'foo': { 'foo': {
'command': '/bin/true', 'command': '/bin/true',
'image': 'alpine:3.7', 'image': 'alpine:3.10.1',
'scale': 3, 'scale': 3,
'restart': 'always:7', 'restart': 'always:7',
'mem_limit': '300M', 'mem_limit': '300M',

2
tests/fixtures/compatibility-mode/docker-compose.yml vendored
View File

@ -1,7 +1,7 @@
version: '3.5' version: '3.5'
services: services:
foo: foo:
image: alpine:3.7 image: alpine:3.10.1
command: /bin/true command: /bin/true
deploy: deploy:
replicas: 3 replicas: 3

2
tests/fixtures/default-env-file/alt/.env vendored
View File

@ -1,4 +1,4 @@
IMAGE=alpine:3.4 IMAGE=alpine:3.10.1
COMMAND=echo uwu COMMAND=echo uwu
PORT1=3341 PORT1=3341
PORT2=4449 PORT2=4449

6
tests/fixtures/networks/docker-compose.yml vendored
View File

@ -2,17 +2,17 @@ version: "2"
services: services:
web: web:
image: alpine:3.7 image: alpine:3.10.1
command: top command: top
networks: ["front"] networks: ["front"]
app: app:
image: alpine:3.7 image: alpine:3.10.1
command: top command: top
networks: ["front", "back"] networks: ["front", "back"]
links: links:
- "db:database" - "db:database"
db: db:
image: alpine:3.7 image: alpine:3.10.1
command: top command: top
networks: ["back"] networks: ["back"]

4
tests/unit/config/config_test.py
View File

@ -3620,7 +3620,7 @@ class InterpolationTest(unittest.TestCase):
'version': '3.5', 'version': '3.5',
'services': { 'services': {
'foo': { 'foo': {
'image': 'alpine:3.7', 'image': 'alpine:3.10.1',
'deploy': { 'deploy': {
'replicas': 3, 'replicas': 3,
'restart_policy': { 'restart_policy': {
@ -3646,7 +3646,7 @@ class InterpolationTest(unittest.TestCase):
service_dict = cfg.services[0] service_dict = cfg.services[0]
assert service_dict == { assert service_dict == {
'image': 'alpine:3.7', 'image': 'alpine:3.10.1',
'scale': 3, 'scale': 3,
'restart': {'MaximumRetryCount': 7, 'Name': 'always'}, 'restart': {'MaximumRetryCount': 7, 'Name': 'always'},
'mem_limit': '300M', 'mem_limit': '300M',