Skip to content

Commit

Permalink
Fix dockerd segmentation fault during startup
Browse files Browse the repository at this point in the history
Backport native dependencies to debian stretch
  • Loading branch information
nosamad committed Sep 30, 2021
1 parent 09774d0 commit fd82907
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ env:
DOCKER_EXPERIMENTAL: 1
DOCKER_GRAPHDRIVER: overlay2
BUILDKIT_PROGRESS: plain
BASE_DEBIAN_DISTRO: buster
GOLANG_VERSION: 1.16.7
BASE_DEBIAN_DISTRO: stretch
GO_VERSION: 1.16.7
APT_MIRROR: cdn-fastly.deb.debian.org
CHECK_CONFIG_COMMIT: 78405559cfe5987174aa2cb6463b9b2c1b917255
TESTDEBUG: 0
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
id: setup-docker-make
uses: WAGO/docker-actions/setup-docker-make@release/v1.0
with:
golang-version: ${{ env.GOLANG_VERSION }}
golang-version: ${{ env.GO_VERSION }}
base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
host-arch: ${{ matrix.arch }}
target-platform: ${{ matrix.platform }}
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
with:
targets: |
cross
golang-version: ${{ env.GOLANG_VERSION }}
golang-version: ${{ env.GO_VERSION }}
base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
host-arch: ${{ matrix.arch }}
target-platform: ${{ matrix.platform }}
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
with:
targets: |
binary
golang-version: ${{ env.GOLANG_VERSION }}
golang-version: ${{ env.GO_VERSION }}
base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
host-arch: ${{ matrix.arch }}
target-platform: ${{ matrix.platform }}
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
with:
targets: |
dynbinary
golang-version: ${{ env.GOLANG_VERSION }}
golang-version: ${{ env.GO_VERSION }}
base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
host-arch: ${{ matrix.arch }}
target-platform: ${{ matrix.platform }}
Expand Down Expand Up @@ -337,7 +337,7 @@ jobs:
with:
targets: |
test-unit
golang-version: ${{ env.GOLANG_VERSION }}
golang-version: ${{ env.GO_VERSION }}
base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
host-arch: ${{ matrix.arch }}
target-platform: ${{ matrix.platform }}
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_VERSION=0.5.0
ARG DOCKER_BUILDTAGS="apparmor seccomp"

ARG BASE_DEBIAN_DISTRO="buster"
ARG BASE_DEBIAN_DISTRO="stretch"
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"

FROM ${GOLANG_IMAGE} AS base
Expand Down Expand Up @@ -167,6 +167,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \

FROM dev-base AS containerd
ARG DEBIAN_FRONTEND
RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list
RUN --mount=type=cache,sharing=locked,id=moby-containerd-aptlib,target=/var/lib/apt \
--mount=type=cache,sharing=locked,id=moby-containerd-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
Expand Down

0 comments on commit fd82907

Please sign in to comment.