mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Pin Dockerfile to -stretch variant
The Golang base images switch to buster, which causes some breakage in networking and packages that are no longer available; (`btrfs-tools` is now an empty package, and `libprotobuf-c0-dev` is gone). Some of out tests also start faiilng on stretch, and will have to be investigated further; ``` 15:13:06 --- FAIL: TestRenameAnonymousContainer (3.37s) 15:13:06 rename_test.go:168: assertion failed: 0 (int) != 1 (inspect.State.ExitCode int): container a7fe866d588d65f353f42ffc5ea5288e52700384e1d90850e9c3d4dce8657666 exited with the wrong exitcode: 15:13:38 --- FAIL: TestHostnameDnsResolution (2.23s) 15:13:38 run_linux_test.go:128: assertion failed: 15:13:38 --- ← 15:13:38 +++ → 15:13:38 @@ -1 +1,2 @@ 15:13:38 +ping: bad address 'foobar' 15:13:38 15:13:38 15:13:38 run_linux_test.go:129: assertion failed: 0 (int) != 1 (res.ExitCode int) ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
4fa57a8191
commit
ed672bb523
2 changed files with 2 additions and 2 deletions
|
@ -27,7 +27,7 @@
|
||||||
ARG CROSS="false"
|
ARG CROSS="false"
|
||||||
ARG GO_VERSION=1.12.7
|
ARG GO_VERSION=1.12.7
|
||||||
|
|
||||||
FROM golang:${GO_VERSION} AS base
|
FROM golang:${GO_VERSION}-stretch AS base
|
||||||
ARG APT_MIRROR
|
ARG APT_MIRROR
|
||||||
RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
|
RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
|
||||||
&& sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list
|
&& sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
ARG GO_VERSION=1.12.7
|
ARG GO_VERSION=1.12.7
|
||||||
|
|
||||||
FROM golang:${GO_VERSION}
|
FROM golang:${GO_VERSION}-stretch
|
||||||
|
|
||||||
# allow replacing httpredir or deb mirror
|
# allow replacing httpredir or deb mirror
|
||||||
ARG APT_MIRROR=deb.debian.org
|
ARG APT_MIRROR=deb.debian.org
|
||||||
|
|
Loading…
Reference in a new issue