Merge remote-tracking branch 'origin/topic/timw/ci-python-upgrades'

* origin/topic/timw/ci-python-upgrades: CI: Remove EOL ubuntu 22.10 build CI: Fix a spelling error in (almost) every Dockerfile CI: Force alpine image to rebuild CI: Install newer version of python on older distros
zeek · Aug 28, 2023 · 2121956 · 2121956
2 parents cb715d3 + 9d2afd8
commit 2121956
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 50 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -151,14 +151,6 @@ opensuse_tumbleweed_task:
   << : *CI_TEMPLATE
   << : *UNIX_ENV
 
-ubuntu2210_task:
-  container:
-    # Ubuntu 22.10 EOL: July 2023
-    dockerfile: ci/ubuntu-22.10/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
-  << : *UNIX_ENV
-
 ubuntu22_task:
   container:
     # Ubuntu 22.04 EOL: April 2027

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,22 @@
+2.7.0-dev.32 | 2023-08-28 09:41:33 -0700
+
+  * CI: Remove EOL ubuntu 22.10 build (Tim Wojtulewicz, Corelight)
+
+  * CI: Fix a spelling error in (almost) every Dockerfile (Tim Wojtulewicz, Corelight)
+
+  * CI: Force alpine image to rebuild (Tim Wojtulewicz, Corelight)
+
+  * CI: Install newer version of python on older distros (Tim Wojtulewicz, Corelight)
+
+  * Merge branch 'topic/awelzel/fix-rtd-doc-build' (Arne Welzel, Corelight)
+
+    * topic/awelzel/fix-rtd-doc-build:
+      doc/conf: Fix html_theme not defined
+
+  * doc/conf: Fix html_theme not defined (Arne Welzel, Corelight)
+
+    Zeek side reference: zeek/zeek-docs#206
+
 2.7.0-dev.25 | 2023-08-24 15:32:31 -0700
 
   * Bump dockerfile images (Dominik Charousset, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.7.0-dev.25
+2.7.0-dev.32
diff --git a/ci/alpine/Dockerfile b/ci/alpine/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:latest
 
 # 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 20230728
+ENV DOCKERFILE_VERSION 20230823
 
 RUN apk add --no-cache \
   bash \

diff --git a/ci/centos-7/Dockerfile b/ci/centos-7/Dockerfile
@@ -1,6 +1,6 @@
 FROM centos:7
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20220519
 
@@ -33,12 +33,15 @@ RUN yum -y install \
     make \
     openssl \
     openssl-devel \
-    python3 \
-    python3-devel \
+    rh-python38 \
+    rh-python38-devel \
+    rh-python38-python-devel \
+    rh-python38-pip \
   && yum clean all && rm -rf /var/cache/yum
 
 RUN echo 'unset BASH_ENV PROMPT_COMMAND ENV' > /usr/bin/zeek-ci-env && \
     echo 'source /opt/rh/devtoolset-8/enable' >> /usr/bin/zeek-ci-env && \
+    echo 'source /opt/rh/rh-python38/enable' >> /usr/bin/zeek-ci-env && \
     echo 'export PATH=${PATH}:${FLEX_DIR}/bin' >> /usr/bin/zeek-ci-env
 
 ENV BASH_ENV="/usr/bin/zeek-ci-env" \

diff --git a/ci/centos-stream-8/Dockerfile b/ci/centos-stream-8/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/centos/centos:stream8
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20220519
 
@@ -13,6 +13,7 @@ RUN dnf -y install \
     make \
     openssl \
     openssl-devel \
-    python3 \
-    python3-devel \
+    python38 \
+    python38-devel \
+    python38-pip\
   && dnf clean all && rm -rf /var/cache/dnf
diff --git a/ci/centos-stream-9/Dockerfile b/ci/centos-stream-9/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/centos/centos:stream9
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20220519
 

diff --git a/ci/debian-10/Dockerfile b/ci/debian-10/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:10
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20230813
 

diff --git a/ci/debian-11/Dockerfile b/ci/debian-11/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:11
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20230813
 

diff --git a/ci/debian-12/Dockerfile b/ci/debian-12/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:12
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20230612
 

diff --git a/ci/fedora-35/Dockerfile b/ci/fedora-35/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora:35
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20220519
 

diff --git a/ci/fedora-37/Dockerfile b/ci/fedora-37/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora:37
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20230813
 

diff --git a/ci/fedora-38/Dockerfile b/ci/fedora-38/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora:38
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20230813
 

diff --git a/ci/opensuse-leap-15.4/Dockerfile b/ci/opensuse-leap-15.4/Dockerfile
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.4
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20220615
 
@@ -9,8 +9,14 @@ RUN zypper in -y \
     gcc \
     gcc-c++ \
     git \
+    gzip \
     libopenssl-devel \
     make \
-    python3 \
-    python3-devel \
+    python39 \
+    python39-devel \
+    python39-pip \
+    tar \
   && rm -rf /var/cache/zypp
+
+RUN update-alternatives --install /usr/bin/pip3 pip3 /usr/bin/pip3.9 100
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 100
diff --git a/ci/opensuse-leap-15.5/Dockerfile b/ci/opensuse-leap-15.5/Dockerfile
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.5
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20230612
 

diff --git a/ci/opensuse-tumbleweed/Dockerfile b/ci/opensuse-tumbleweed/Dockerfile
@@ -1,6 +1,6 @@
 FROM opensuse/tumbleweed
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20230329
 

diff --git a/ci/ubuntu-18.04/Dockerfile b/ci/ubuntu-18.04/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20220519
 

diff --git a/ci/ubuntu-20.04/Dockerfile b/ci/ubuntu-20.04/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20220519
 

diff --git a/ci/ubuntu-22.04/Dockerfile b/ci/ubuntu-22.04/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20230813
 

diff --git a/ci/ubuntu-22.10/Dockerfile b/ci/ubuntu-22.10/Dockerfile
diff --git a/ci/windows/Dockerfile b/ci/windows/Dockerfile
@@ -16,7 +16,7 @@
 
 FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019
 
-# A version field to invalide Cirrus's build cache when needed, as suggested in
+# 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 20230728