From d0f90ada40594a5bf39fa4a41a24be2bf6c5043e Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Wed, 8 Feb 2023 17:24:08 +0100 Subject: [PATCH] Update github actions to Ubuntu 22.04 and OpenSSL3 --- Dockerfile | 4 ++-- scripts/continuous-integration/docker/install-dependencies.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b514187..f6a341f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ ARG GH_MATRIX_SSL -FROM debian:oldstable as img_ssl1 +FROM debian:buster as img_ssl1 ONBUILD ENV SSL_LIB_NAME=libssl1.1 -FROM ubuntu:jammy as img_ssl3 +FROM debian:bookworm as img_ssl3 ONBUILD ENV SSL_LIB_NAME=libssl3 FROM img_${GH_MATRIX_SSL} AS build diff --git a/scripts/continuous-integration/docker/install-dependencies.sh b/scripts/continuous-integration/docker/install-dependencies.sh index 21db12b..234a34e 100644 --- a/scripts/continuous-integration/docker/install-dependencies.sh +++ b/scripts/continuous-integration/docker/install-dependencies.sh @@ -28,7 +28,7 @@ if [ -n "${CROSS_BUILD_DEPS_DIR}" ]; then PWD_BEFORE_CROSS_DEPS=$(pwd) if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-013" ]]; then echo "Setting up cross build deps dir" - rm -rf "$CROSS_BUILD_DEPS_DIR" || true + find "$CROSS_BUILD_DEPS_DIR" -mindepth 1 -delete || true mkdir -p "$CROSS_BUILD_DEPS_DIR" cd "$CROSS_BUILD_DEPS_DIR"