summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2021-08-23 15:27:42 -0400
committerGitHub <noreply@github.com>2021-08-23 15:27:42 -0400
commita09d4367495fb8a1300aeea5fd6ee22f26745ec8 (patch)
tree3b862e821374fa936cc176c76804b3d46c522dbb
parent76c503c37eb2a6ceb0a1cefeba82e627bf5bb0c6 (diff)
parentdbcb1cd74696ea54fa0d80bc33f659a27d1254bf (diff)
downloadlibgit2-a09d4367495fb8a1300aeea5fd6ee22f26745ec8.tar.gz
Merge pull request #6000 from libgit2/ethomson/ci
ci: tag new containers with the latest tag
-rw-r--r--.github/workflows/main.yml2
-rw-r--r--ci/docker/bionic1
-rw-r--r--ci/docker/centos71
-rw-r--r--ci/docker/centos81
-rw-r--r--ci/docker/docurium1
-rw-r--r--ci/docker/focal1
-rw-r--r--ci/docker/xenial1
7 files changed, 8 insertions, 0 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d1a0be720..b58f57758 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -70,7 +70,9 @@ jobs:
BASE_ARG="--build-arg BASE=${{ matrix.container.base }}"
fi
docker build -t ${{ env.docker-registry-container-sha }} ${BASE_ARG} -f ${{ env.dockerfile }} .
+ docker tag ${{ env.docker-registry-container-sha }} ${{ env.docker-registry-container-latest }}
docker push ${{ env.docker-registry-container-sha }}
+ docker push ${{ env.docker-registry-container-latest }}
working-directory: ${{ env.docker-config-path }}
if: github.event_name != 'pull_request' && env.docker-container-exists != 'true'
diff --git a/ci/docker/bionic b/ci/docker/bionic
index fb6a34b1c..51af5c01c 100644
--- a/ci/docker/bionic
+++ b/ci/docker/bionic
@@ -1,4 +1,5 @@
ARG BASE=ubuntu:bionic
+
FROM ${BASE} AS apt
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/ci/docker/centos7 b/ci/docker/centos7
index 082b9e225..098edb26a 100644
--- a/ci/docker/centos7
+++ b/ci/docker/centos7
@@ -1,4 +1,5 @@
ARG BASE=centos:7
+
FROM ${BASE} AS yum
RUN yum install -y \
which \
diff --git a/ci/docker/centos8 b/ci/docker/centos8
index e1fb7684a..f47198446 100644
--- a/ci/docker/centos8
+++ b/ci/docker/centos8
@@ -1,4 +1,5 @@
ARG BASE=centos:8
+
FROM ${BASE} AS yum
RUN yum install -y \
which \
diff --git a/ci/docker/docurium b/ci/docker/docurium
index 7aa247532..1957bbb3b 100644
--- a/ci/docker/docurium
+++ b/ci/docker/docurium
@@ -1,4 +1,5 @@
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 c0c57f640..171387698 100644
--- a/ci/docker/focal
+++ b/ci/docker/focal
@@ -1,4 +1,5 @@
ARG BASE=ubuntu:focal
+
FROM ${BASE} AS apt
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/ci/docker/xenial b/ci/docker/xenial
index d2ba0313f..4c3810af4 100644
--- a/ci/docker/xenial
+++ b/ci/docker/xenial
@@ -1,4 +1,5 @@
ARG BASE=ubuntu:xenial
+
FROM ${BASE} AS apt
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \