chore(cross): Upgrade openssl, clang (#5157)

ovr · web-flow · commit f2260dbc22b5 · 2023-01-04T12:48:14.000+03:00
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -53,11 +53,11 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
-          version: v0.6.3
+          version: v0.9.1
       - name: Push to Docker Hub
         uses: docker/build-push-action@v2
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -84,7 +84,7 @@ jobs:
             package_target_libc: glibc
       fail-fast: false
     container:
-      image: cubejs/rust-cross:${{ matrix.target }}-02012023
+      image: cubejs/rust-cross:${{ matrix.target }}-03012023
 
     steps:
       - name: Checkout
@@ -273,11 +273,11 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
-          version: v0.6.3
+          version: v0.9.1
       - name: Copy yarn.lock file
         run: cp yarn.lock packages/cubejs-docker
       - name: Push to Docker Hub
@@ -345,11 +345,11 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
-          version: v0.6.3
+          version: v0.9.1
       - name: Copy yarn.lock file
         run: cp yarn.lock packages/cubejs-docker
       - name: Push to Docker Hub
@@ -417,11 +417,11 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
-          version: v0.6.3
+          version: v0.9.1
       - name: Copy yarn.lock file
         run: cp yarn.lock packages/cubejs-docker
       - name: Push to Docker Hub
@@ -513,9 +513,9 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
-          version: v0.6.3
+          version: v0.9.1
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/push-cross-images.yml b/.github/workflows/push-cross-images.yml
@@ -34,17 +34,21 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
-          version: v0.6.3
+          version: v0.9.1
           driver-opts: network=host
+      - name: Load .cross file
+        uses: xom9ikk/dotenv@v2
+        with:
+          path: rust/cubestore/cross/
       - name: Push to Docker Hub
         uses: docker/build-push-action@v2
         with:
           context: ./
           file: ./rust/cubestore/cross/${{ matrix.target }}.Dockerfile
           platforms: linux/amd64
           push: ${{ github.ref == 'refs/heads/master' }}
-          tags: cubejs/rust-cross:${{ matrix.target }}
+          tags: cubejs/rust-cross:${{ matrix.target }},cubejs/rust-cross:${{ matrix.target }}-${{ env.CROSS_VERSION }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -555,11 +555,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
-          version: v0.6.3
+          version: v0.9.1
           driver-opts: network=host
       - name: Build image
         uses: docker/build-push-action@v2
diff --git a/.github/workflows/rust-cubesql.yml b/.github/workflows/rust-cubesql.yml
@@ -130,7 +130,7 @@ jobs:
         target: ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]
       fail-fast: false
     container:
-      image: cubejs/rust-cross:${{ matrix.target }}-02012023
+      image: cubejs/rust-cross:${{ matrix.target }}-03012023
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml
@@ -129,9 +129,9 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
-          version: v0.6.3
+          version: v0.9.1
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/rust-cubestore.yml b/.github/workflows/rust-cubestore.yml
@@ -78,9 +78,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
-          version: v0.6.3
+          version: v0.9.1
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:
diff --git a/rust/cubestore/Cross.toml b/rust/cubestore/Cross.toml
@@ -1,23 +1,23 @@
 [target.x86_64-apple-darwin]
-image = "cubejs/rust-cross:x86_64-apple-darwin-10012022"
+image = "cubejs/rust-cross:x86_64-apple-darwin-03012023"
 xargo = false
 
 [target.x86_64-pc-windows-msvc]
-image = "cubejs/rust-cross:x86_64-pc-windows-msvc-10012022"
+image = "cubejs/rust-cross:x86_64-pc-windows-msvc-03012023"
 xargo = false
 
 [target.x86_64-pc-windows-gnu]
-image = "cubejs/rust-cross:x86_64-pc-windows-gnu-10012022"
+image = "cubejs/rust-cross:x86_64-pc-windows-gnu-03012023"
 xargo = false
 
 [target.x86_64-unknown-linux-gnu]
-image = "cubejs/rust-cross:x86_64-unknown-linux-gnu-02012023"
+image = "cubejs/rust-cross:x86_64-unknown-linux-gnu-03012023"
 xargo = false
 
 [target.x86_64-unknown-linux-musl]
-image = "cubejs/rust-cross:x86_64-unknown-linux-musl-02012023"
+image = "cubejs/rust-cross:x86_64-unknown-linux-musl-03012023"
 xargo = false
 
 [target.aarch64-unknown-linux-gnu]
-image = "cubejs/rust-cross:aarch64-unknown-linux-gnu-02012023"
+image = "cubejs/rust-cross:aarch64-unknown-linux-gnu-03012023"
 xargo = false
diff --git a/rust/cubestore/cross/.env b/rust/cubestore/cross/.env
@@ -0,0 +1 @@
+CROSS_VERSION=03012023
diff --git a/rust/cubestore/cross/README.md b/rust/cubestore/cross/README.md
@@ -18,7 +18,7 @@ Keep in mind:
 
 ```sh
 # dmY
-export CROSS_VERSION=02012023
+export $(cat .env | xargs)
 
 # docker build -t cubejs/rust-cross:x86_64-apple-darwin-$CROSS_VERSION -f x86_64-apple-darwin.Dockerfile .
 # docker buildx build --platform linux/amd64 -t cubejs/rust-cross:x86_64-pc-windows-gnu-$CROSS_VERSION -f x86_64-pc-windows-gnu.Dockerfile .
diff --git a/rust/cubestore/cross/aarch64-unknown-linux-gnu.Dockerfile b/rust/cubestore/cross/aarch64-unknown-linux-gnu.Dockerfile
@@ -7,21 +7,23 @@ RUN apt-get update \
     && apt-get -y upgrade \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common pkg-config wget apt-transport-https ca-certificates \
     && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-    && add-apt-repository "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-12 main"  \
+    && add-apt-repository "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-14 main"  \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y gcc-multilib g++-multilib \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-12 clang-12 libclang-12-dev clang-12 \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-14 clang-14 libclang-14-dev clang-14 \
         make cmake libsasl2-dev \
         libc6 libc6-dev libc6-arm64-cross libc6-dev-arm64-cross \
         gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*;
 
-RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100
-RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100
-RUN update-alternatives --install /usr/bin/clang-cpp clang-cpp /usr/bin/clang-cpp-12 100
+RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 100
+RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
+RUN update-alternatives --install /usr/bin/clang-cpp clang-cpp /usr/bin/clang-cpp-14 100
+RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-14 100
+RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-14 100
 
 # https://www.openssl.org/source/old/1.1.1/
-ENV OPENSSL_VERSION=1.1.1l
+ENV OPENSSL_VERSION=1.1.1q
 ENV LIZB_VERSION=1.2.13
 
 ENV ARCH=arm \
diff --git a/rust/cubestore/cross/x86_64-apple-darwin.Dockerfile b/rust/cubestore/cross/x86_64-apple-darwin.Dockerfile
@@ -1 +1 @@
-FROM joseluisq/rust-linux-darwin-builder:1.50.0
+FROM joseluisq/rust-linux-darwin-builder:1.60.0
diff --git a/rust/cubestore/cross/x86_64-unknown-linux-gnu.Dockerfile b/rust/cubestore/cross/x86_64-unknown-linux-gnu.Dockerfile
@@ -3,18 +3,19 @@ FROM debian:buster-slim
 RUN apt-get update && apt-get -y upgrade \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common pkg-config wget gnupg git apt-transport-https ca-certificates \
     && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-    && add-apt-repository "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-12 main"  \
+    && add-apt-repository "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-14 main"  \
     && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-12 clang-12 libclang-12-dev clang-12 make cmake \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-14 clang-14 libclang-14-dev clang-14 make cmake \
     && rm -rf /var/lib/apt/lists/*;
 
-RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100
-RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100
-RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-12 100
-RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-12 100
+RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 100
+RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
+RUN update-alternatives --install /usr/bin/clang-cpp clang-cpp /usr/bin/clang-cpp-14 100
+RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-14 100
+RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-14 100
 
 # https://www.openssl.org/source/old/1.1.1/
-ARG OPENSSL_VERSION=1.1.1l
+ARG OPENSSL_VERSION=1.1.1q
 
 RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O - | tar -xz &&\
     cd openssl-${OPENSSL_VERSION} && \
diff --git a/rust/cubestore/cross/x86_64-unknown-linux-musl.Dockerfile b/rust/cubestore/cross/x86_64-unknown-linux-musl.Dockerfile
@@ -6,9 +6,9 @@ RUN apt-get update \
     && apt-get -y upgrade \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common pkg-config wget musl-tools libc6-dev apt-transport-https ca-certificates \
     && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-    && add-apt-repository "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-12 main"  \
+    && add-apt-repository "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-14 main"  \
     && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-12 clang-12 libclang-12-dev clang-12 make cmake \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-14 clang-14 libclang-14-dev clang-14 make cmake \
     && rm -rf /var/lib/apt/lists/*;
 
 RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/x86_64-linux-musl/asm && \
@@ -19,7 +19,7 @@ RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/x86_64-linux-musl/asm &
 RUN mkdir /musl
 
 # https://www.openssl.org/source/old/1.1.1/
-ARG OPENSSL_VERSION=1.1.1l
+ARG OPENSSL_VERSION=1.1.1q
 
 RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O - | tar -xz &&\
     cd openssl-${OPENSSL_VERSION} && \
