diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2020-11-23 14:28:26 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2020-11-23 23:08:23 +0000 |
| commit | 5a9d16dceb213af734697e7f552a5b79b6e46893 (patch) | |
| tree | 8cc15520756a8ba313572091c456f1b7f57bccc4 /ci | |
| parent | 9f8802d3eaa9dc915c6dc77c517952a49d566100 (diff) | |
| download | libgit2-5a9d16dceb213af734697e7f552a5b79b6e46893.tar.gz | |
ci: support multi-arch docker builds
Provide the base to our docker images and run with the QEMU docker
support optionally.
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/docker/bionic | 3 | ||||
| -rw-r--r-- | ci/docker/docurium | 3 | ||||
| -rw-r--r-- | ci/docker/focal | 3 | ||||
| -rw-r--r-- | ci/docker/xenial | 3 | ||||
| -rwxr-xr-x | ci/getcontainer.sh | 14 |
5 files changed, 18 insertions, 8 deletions
diff --git a/ci/docker/bionic b/ci/docker/bionic index 9ecb5da60..85bb6ecae 100644 --- a/ci/docker/bionic +++ b/ci/docker/bionic @@ -1,4 +1,5 @@ -FROM ubuntu:bionic AS apt +ARG BASE=ubuntu:bionic +FROM ${BASE} AS apt RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ clang \ diff --git a/ci/docker/docurium b/ci/docker/docurium index 54a4202b6..7aa247532 100644 --- a/ci/docker/docurium +++ b/ci/docker/docurium @@ -1,3 +1,4 @@ -FROM ubuntu:bionic +ARG BASE=ubuntu:bionic +FROM ${BASE} RUN apt update && apt install -y cmake pkg-config ruby ruby-dev llvm libclang-dev libssl-dev python-pygments RUN gem install docurium diff --git a/ci/docker/focal b/ci/docker/focal index c75e85a4c..c6fefc787 100644 --- a/ci/docker/focal +++ b/ci/docker/focal @@ -1,4 +1,5 @@ -FROM ubuntu:focal AS apt +ARG BASE=ubuntu:focal +FROM ${BASE} AS apt RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ bzip2 \ diff --git a/ci/docker/xenial b/ci/docker/xenial index 67867edc6..1c8e585d2 100644 --- a/ci/docker/xenial +++ b/ci/docker/xenial @@ -1,4 +1,5 @@ -FROM ubuntu:xenial AS apt +ARG BASE=ubuntu:xenial +FROM ${BASE} AS apt RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ bzip2 \ diff --git a/ci/getcontainer.sh b/ci/getcontainer.sh index b259260f4..07ef7b8ea 100755 --- a/ci/getcontainer.sh +++ b/ci/getcontainer.sh @@ -2,22 +2,28 @@ set -e -DOCKERFILE_PATH=$1 +IMAGE_NAME=$1 +DOCKERFILE_PATH=$2 -if [ "${DOCKERFILE_PATH}" = "" ]; then - echo "usage: $0 dockerfile" +if [ "${IMAGE_NAME}" = "" ]; then + echo "usage: $0 image_name [dockerfile]" exit 1 fi +if [ "${DOCKERFILE_PATH}" = "" ]; then + DOCKERFILE_PATH="${IMAGE_NAME}" +fi + if [ "${DOCKER_REGISTRY}" = "" ]; then echo "DOCKER_REGISTRY environment variable is unset." echo "Not running inside GitHub Actions or misconfigured?" exit 1 fi -DOCKER_CONTAINER="${GITHUB_REPOSITORY}/$(basename ${DOCKERFILE_PATH})" +DOCKER_CONTAINER="${GITHUB_REPOSITORY}/${IMAGE_NAME}" DOCKER_REGISTRY_CONTAINER="${DOCKER_REGISTRY}/${DOCKER_CONTAINER}" +echo "dockerfile=${DOCKERFILE_PATH}" >> $GITHUB_ENV echo "docker-container=${DOCKER_CONTAINER}" >> $GITHUB_ENV echo "docker-registry-container=${DOCKER_REGISTRY_CONTAINER}" >> $GITHUB_ENV |