From: Gregor Jasny <gregor.jasny@logmein.com>
Date: Tue, 6 Jul 2021 20:18:44 +0000 (+0200)
Subject: Update dockerfiles with supported distributions (#886)
X-Git-Tag: v4.4~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c61dd5ad2db30c9b3e12900d75c9b78e2fe92aaf;p=thirdparty%2Fccache.git

Update dockerfiles with supported distributions (#886)
---

diff --git a/dockerfiles/alpine-3.12/Dockerfile b/dockerfiles/alpine-3.14/Dockerfile
similarity index 95%
rename from dockerfiles/alpine-3.12/Dockerfile
rename to dockerfiles/alpine-3.14/Dockerfile
index 324921a0d..856636f01 100644
--- a/dockerfiles/alpine-3.12/Dockerfile
+++ b/dockerfiles/alpine-3.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --no-cache \
         bash \
diff --git a/dockerfiles/alpine-3.4/Dockerfile b/dockerfiles/alpine-3.8/Dockerfile
similarity index 72%
rename from dockerfiles/alpine-3.4/Dockerfile
rename to dockerfiles/alpine-3.8/Dockerfile
index ad42a0042..28f24b9e1 100644
--- a/dockerfiles/alpine-3.4/Dockerfile
+++ b/dockerfiles/alpine-3.8/Dockerfile
@@ -1,16 +1,17 @@
-# Released 2016, this is the first release to contain cmake >= 3.4.3
-
-FROM alpine:3.4
+FROM alpine:3.8
 
 RUN apk add --no-cache \
         bash \
         ccache \
+        clang \
         cmake \
+        elfutils \
         g++ \
         gcc \
         libc-dev \
         make \
-        perl
+        perl \
+        zstd-dev
 
 # Redirect all compilers to ccache.
 RUN for t in gcc g++ cc c++ clang clang++; do ln -vs /usr/bin/ccache /usr/local/bin/$t; done
diff --git a/dockerfiles/centos-8/Dockerfile b/dockerfiles/centos-8/Dockerfile
index b7ab38fd6..784533cfa 100644
--- a/dockerfiles/centos-8/Dockerfile
+++ b/dockerfiles/centos-8/Dockerfile
@@ -1,6 +1,8 @@
 FROM centos:8
 
+# also run update due to https://bugs.centos.org/view.php?id=18212
 RUN dnf install -y epel-release \
+ && dnf update -y \
  && dnf install -y \
         asciidoc \
         autoconf \
diff --git a/dockerfiles/debian-9/Dockerfile b/dockerfiles/debian-11/Dockerfile
similarity index 95%
rename from dockerfiles/debian-9/Dockerfile
rename to dockerfiles/debian-11/Dockerfile
index b4c658541..57bfdbeb5 100644
--- a/dockerfiles/debian-9/Dockerfile
+++ b/dockerfiles/debian-11/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:9
+FROM debian:bullseye
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
diff --git a/dockerfiles/ubuntu-16.04/Dockerfile b/dockerfiles/ubuntu-16.04/Dockerfile
deleted file mode 100644
index 7c9ddbcc7..000000000
--- a/dockerfiles/ubuntu-16.04/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-        asciidoc \
-        bash \
-        build-essential \
-        ccache \
-        clang \
-        cmake \
-        docbook-xml \
-        docbook-xsl \
-        elfutils \
-        gcc-multilib \
-        libzstd1-dev \
-        xsltproc \
- && rm -rf /var/lib/apt/lists/*
-
-# Redirect all compilers to ccache.
-RUN for t in gcc g++ cc c++ clang clang++; do ln -vs /usr/bin/ccache /usr/local/bin/$t; done
diff --git a/misc/test-all-systems b/misc/test-all-systems
index 349d3fd1b..3e28cc6bf 100755
--- a/misc/test-all-systems
+++ b/misc/test-all-systems
@@ -20,14 +20,11 @@ build() {
 
 #     NAME         CC    CXX     TEST_CC CMAKE_PARAMS
 
-build debian-9     gcc   g++     gcc
-build debian-9     clang clang++ clang
-
 build debian-10    gcc   g++     gcc
 build debian-10    clang clang++ clang
 
-build ubuntu-16.04 gcc   g++     gcc
-build ubuntu-16.04 gcc   g++     clang
+build debian-11    gcc   g++     gcc
+build debian-11    clang clang++ clang
 
 build ubuntu-18.04 gcc   g++     gcc
 build ubuntu-18.04 clang clang++ clang
@@ -44,8 +41,8 @@ build centos-8     clang clang++ clang
 build fedora-32    gcc   g++     gcc
 build fedora-32    clang clang++ clang
 
-build alpine-3.4   gcc   g++     gcc     -DZSTD_FROM_INTERNET=ON
-build alpine-3.4   gcc   g++     clang   -DZSTD_FROM_INTERNET=ON
+build alpine-3.8   gcc   g++     gcc
+build alpine-3.8   gcc   g++     clang
 
-build alpine-3.12  gcc   g++     gcc
-build alpine-3.12  clang clang++ clang
+build alpine-3.14  gcc   g++     gcc
+build alpine-3.14  clang clang++ clang
diff --git a/src/storage/secondary/FileStorage.hpp b/src/storage/secondary/FileStorage.hpp
index bcf9de1ed..ac4271a84 100644
--- a/src/storage/secondary/FileStorage.hpp
+++ b/src/storage/secondary/FileStorage.hpp
@@ -23,6 +23,8 @@
 
 #include <third_party/url.hpp>
 
+#include <sys/stat.h> // for mode_t
+
 namespace storage {
 namespace secondary {
 
diff --git a/src/util/string_utils.hpp b/src/util/string_utils.hpp
index 5533e683f..7297b66ac 100644
--- a/src/util/string_utils.hpp
+++ b/src/util/string_utils.hpp
@@ -22,6 +22,8 @@
 #include <third_party/nonstd/optional.hpp>
 #include <third_party/nonstd/string_view.hpp>
 
+#include <sys/stat.h> // for mode_t
+
 #include <string>
 #include <utility>