diff options
author | aiordache <anca.iordache@docker.com> | 2019-08-19 17:30:28 +0200 |
---|---|---|
committer | aiordache <anca.iordache@docker.com> | 2019-08-20 12:10:26 +0200 |
commit | 60dcf87cc08bef7d45f1b376fe54374c3c1f99a1 (patch) | |
tree | c17d2a8ef1bda11f4cc486700811bb7af4276d45 | |
parent | cf3c07d6ee15659ce079eaeafc11b63a034b4c3c (diff) |
update alpine version to 3.10.1
Signed-off-by: aiordache <anca.iordache@docker.com>
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | Dockerfile.s390x | 2 | ||||
-rw-r--r-- | tests/acceptance/cli_test.py | 4 | ||||
-rw-r--r-- | tests/fixtures/compatibility-mode/docker-compose.yml | 2 | ||||
-rw-r--r-- | tests/fixtures/default-env-file/alt/.env | 2 | ||||
-rw-r--r-- | tests/fixtures/networks/docker-compose.yml | 6 | ||||
-rw-r--r-- | tests/unit/config/config_test.py | 4 |
7 files changed, 11 insertions, 11 deletions
@@ -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 diff --git a/Dockerfile.s390x b/Dockerfile.s390x index 3b19bb39..9bae72d6 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -1,4 +1,4 @@ -FROM s390x/alpine:3.6 +FROM s390x/alpine:3.10.1 ARG COMPOSE_VERSION=1.16.1 diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py index 77b46c27..14dbb7d6 100644 --- a/tests/acceptance/cli_test.py +++ b/tests/acceptance/cli_test.py @@ -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', diff --git a/tests/fixtures/compatibility-mode/docker-compose.yml b/tests/fixtures/compatibility-mode/docker-compose.yml index 8187b110..4b63fadf 100644 --- a/tests/fixtures/compatibility-mode/docker-compose.yml +++ b/tests/fixtures/compatibility-mode/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.5' services: foo: - image: alpine:3.7 + image: alpine:3.10.1 command: /bin/true deploy: replicas: 3 diff --git a/tests/fixtures/default-env-file/alt/.env b/tests/fixtures/default-env-file/alt/.env index 163668d2..981c7207 100644 --- a/tests/fixtures/default-env-file/alt/.env +++ b/tests/fixtures/default-env-file/alt/.env @@ -1,4 +1,4 @@ -IMAGE=alpine:3.4 +IMAGE=alpine:3.10.1 COMMAND=echo uwu PORT1=3341 PORT2=4449 diff --git a/tests/fixtures/networks/docker-compose.yml b/tests/fixtures/networks/docker-compose.yml index 275376ae..b911c752 100644 --- a/tests/fixtures/networks/docker-compose.yml +++ b/tests/fixtures/networks/docker-compose.yml @@ -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"] diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py index b583422f..5ad1a233 100644 --- a/tests/unit/config/config_test.py +++ b/tests/unit/config/config_test.py @@ -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', |