From dc6580a000be901df86368e7abce1d7811a596ae Mon Sep 17 00:00:00 2001 From: Ximon Eighteen <3304436+ximon18@users.noreply.github.com> Date: Wed, 10 Feb 2021 10:54:55 +0100 Subject: [PATCH] Use an official Alpine docker image release rather than Alpine Edge. (#394) * Use an official Alpine docker image release rather than Alpine Edge. * Remove accidental passing of multi-user feature flag to cargo build. --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1983bc77..90d5bd93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,7 @@ # Make the base image configurable so that the E2E test can use a base image # with a prepopulated Cargo build cache to accelerate the build process. # Use Ubuntu 16.04 because this is what the Travis CI Krill build uses. -# -# Use Alpine edge (speific dated build 20201218) to get Rust >= 1.45.0 as needed -# to build Krill, as latest Alpine release contains Rust 1.44.0. -ARG BASE_IMG=alpine:20201218 +ARG BASE_IMG=alpine:3.13 # # -- stage 1: build krill and krillc @@ -18,7 +15,6 @@ WORKDIR /tmp/krill COPY . . RUN cargo build --target x86_64-alpine-linux-musl --release - # # -- stage 2: create an image containing just the binaries, configs & # scripts needed to run Krill, and not the things needed to build