CI: Add variable to Dockerfiles to force rebuilds

This makes the Dockerfiles consistent with other repositories that do the same.
zeek · Aug 23, 2023 · 310d83e · 310d83e
1 parent 1b8fac9
commit 310d83e
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 0 deletions.
diff --git a/ci/centos-7/Dockerfile b/ci/centos-7/Dockerfile
@@ -1,5 +1,9 @@
 FROM centos:7
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN yum -y install \
     epel-release \
   && yum clean all && rm -rf /var/cache/yum

diff --git a/ci/centos-stream-8/Dockerfile b/ci/centos-stream-8/Dockerfile
@@ -1,5 +1,9 @@
 FROM quay.io/centos/centos:stream8
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 RUN dnf config-manager --set-enabled powertools
 

diff --git a/ci/centos-stream-9/Dockerfile b/ci/centos-stream-9/Dockerfile
@@ -1,5 +1,9 @@
 FROM quay.io/centos/centos:stream9
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 # dnf config-manager isn't available at first, and
 # we need it to install the CRB repo below.
 RUN dnf -y install 'dnf-command(config-manager)'

diff --git a/ci/debian-10/Dockerfile b/ci/debian-10/Dockerfile
@@ -1,5 +1,9 @@
 FROM debian:10
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 ENV CMAKE_DIR "/opt/cmake"

diff --git a/ci/debian-11/Dockerfile b/ci/debian-11/Dockerfile
@@ -1,5 +1,9 @@
 FROM debian:11
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 RUN apt-get update && apt-get -y install \

diff --git a/ci/fedora-37/Dockerfile b/ci/fedora-37/Dockerfile
@@ -1,5 +1,9 @@
 FROM fedora:37
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN dnf -y install \
     cmake \
     diffutils \

diff --git a/ci/fedora-38/Dockerfile b/ci/fedora-38/Dockerfile
@@ -1,5 +1,9 @@
 FROM fedora:38
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN dnf -y install \
     cmake \
     diffutils \

diff --git a/ci/opensuse-leap-15.4/Dockerfile b/ci/opensuse-leap-15.4/Dockerfile
@@ -1,5 +1,9 @@
 FROM opensuse/leap:15.4
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN zypper refresh \
  && zypper in -y \
     cmake \

diff --git a/ci/opensuse-tumbleweed/Dockerfile b/ci/opensuse-tumbleweed/Dockerfile
@@ -1,5 +1,9 @@
 FROM opensuse/tumbleweed
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN zypper refresh \
  && zypper in -y \
     cmake \

diff --git a/ci/ubuntu-20.04/Dockerfile b/ci/ubuntu-20.04/Dockerfile
@@ -1,5 +1,9 @@
 FROM ubuntu:20.04
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 RUN apt-get update && apt-get -y install \

diff --git a/ci/ubuntu-22.04/Dockerfile b/ci/ubuntu-22.04/Dockerfile
@@ -1,5 +1,9 @@
 FROM ubuntu:22.04
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 RUN apt-get update && apt-get -y install \