Skip to content

Commit

Permalink
update v1_20210422 base image
Browse files Browse the repository at this point in the history
Signed-off-by: Mohamed Eldafrawi <mohamed.eldafrawi@suse.com>
  • Loading branch information
Mohamed Eldafrawi authored and innobead committed Nov 25, 2021
1 parent 87eb606 commit 595fea1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
12 changes: 7 additions & 5 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand All @@ -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}
Expand Down
13 changes: 9 additions & 4 deletions package/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down

0 comments on commit 595fea1

Please sign in to comment.