summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2020-06-10 22:18:13 +0100
committerEdward Thomson <ethomson@edwardthomson.com>2020-06-11 13:21:47 +0100
commit4852d8daa51772bc585ec983d3badfa89f90e6d3 (patch)
tree122e7abf5daf7d7a21e1f096cfb1413657b2b98a
parent8b8b69a785d0a6527ba1c56185df1e7beddc6227 (diff)
downloadlibgit2-4852d8daa51772bc585ec983d3badfa89f90e6d3.tar.gz
docker: don't take BASE as an argument
The xenial image depends on ubuntu:xenial; the bionic one on ubuntu:bionic. No need for this to be a variable, that's just additional (unnecessary) state to manage in the CI setup(s).
-rw-r--r--azure-pipelines/docker/bionic3
-rw-r--r--azure-pipelines/docker/xenial3
2 files changed, 2 insertions, 4 deletions
diff --git a/azure-pipelines/docker/bionic b/azure-pipelines/docker/bionic
index 65a14063a..5918584dc 100644
--- a/azure-pipelines/docker/bionic
+++ b/azure-pipelines/docker/bionic
@@ -1,5 +1,4 @@
-ARG BASE
-FROM $BASE AS apt
+FROM ubuntu:bionic AS apt
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
clang \
diff --git a/azure-pipelines/docker/xenial b/azure-pipelines/docker/xenial
index bfb96d9db..67867edc6 100644
--- a/azure-pipelines/docker/xenial
+++ b/azure-pipelines/docker/xenial
@@ -1,5 +1,4 @@
-ARG BASE
-FROM $BASE AS apt
+FROM ubuntu:xenial AS apt
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
bzip2 \