From 595fea12cb13171df965d8099fd2e96e7136fafd Mon Sep 17 00:00:00 2001 From: Mohamed Eldafrawi Date: Thu, 25 Nov 2021 02:45:14 +0200 Subject: [PATCH] update v1_20210422 base image Signed-off-by: Mohamed Eldafrawi --- Dockerfile.dapper | 12 +++++++----- package/Dockerfile | 13 +++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 88ddf349..57286a34 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,5 +1,4 @@ -FROM ubuntu:18.04 -# FROM arm64=arm64v8/ubuntu:18.04 +FROM ubuntu:20.04 ARG DAPPER_HOST_ARCH=amd64 ARG http_proxy @@ -14,10 +13,13 @@ ENV DAPPER_OUTPUT bin ENV DAPPER_SOURCE /go/src/github.com/longhorn/backing-image-manager WORKDIR ${DAPPER_SOURCE} +ENV DEBIAN_FRONTEND=noninteractive + # Install packages RUN apt-get update && \ + apt-get dist-upgrade -y && \ apt-get install -y cmake wget curl git less file \ - libglib2.0-dev libkmod-dev libnl-genl-3-dev linux-libc-dev pkg-config psmisc python-tox qemu-utils fuse python-dev \ + libglib2.0-dev libkmod-dev libnl-genl-3-dev linux-libc-dev pkg-config psmisc tox qemu-utils fuse python-dev \ devscripts debhelper bash-completion librdmacm-dev libibverbs-dev xsltproc docbook-xsl \ libconfig-general-perl libaio-dev libc6-dev iptables libltdl7 libdevmapper-dev iproute2 jq @@ -31,8 +33,8 @@ RUN wget -O - https://storage.googleapis.com/golang/go1.14.1.linux-${!GOLANG_ARC go get github.com/rancher/trash && go get -u golang.org/x/lint/golint # Docker -ENV DOCKER_URL_amd64=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64/docker-ce_18.06.3~ce~3-0~ubuntu_amd64.deb \ - DOCKER_URL_arm64=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/arm64/docker-ce_18.06.3~ce~3-0~ubuntu_arm64.deb \ +ENV DOCKER_URL_amd64=https://download.docker.com/linux/ubuntu/dists/focal/pool/stable/amd64/docker-ce-cli_20.10.7~3-0~ubuntu-focal_amd64.deb \ + DOCKER_URL_arm64=https://download.docker.com/linux/ubuntu/dists/focal/pool/stable/arm64/docker-ce-cli_20.10.7~3-0~ubuntu-focal_arm64.deb \ DOCKER_URL=DOCKER_URL_${ARCH} RUN wget ${!DOCKER_URL} -O docker_ce_${ARCH} && dpkg -i docker_ce_${ARCH} diff --git a/package/Dockerfile b/package/Dockerfile index 5fe0df9c..1c707ac2 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -1,10 +1,15 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 ARG ARCH=amd64 -RUN apt-get update && apt-get install -y kmod curl wget nfs-common fuse \ - libibverbs1 librdmacm1 libconfig-general-perl libaio1 sg3-utils \ - iputils-ping telnet iperf qemu-utils iproute2 +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install -y kmod curl wget nfs-common fuse \ + libibverbs1 librdmacm1 libconfig-general-perl libaio1 sg3-utils \ + iputils-ping telnet iperf qemu-utils iproute2 && \ + rm -rf /var/lib/apt/lists/* # Install grpc_health_probe RUN wget https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.3.2/grpc_health_probe-linux-${ARCH} -O /usr/local/bin/grpc_health_probe && \