From 8012f1962dd50f9103c1c070405e4b5e0e488581 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Sun, 24 Nov 2024 14:13:26 +0100 Subject: [PATCH] further fixup to #298 --- .circleci/config.yml | 4 ++-- httpd/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d41074b7..550cb1ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -261,9 +261,9 @@ jobs: name: Test httpd using curl (dev) (main/master) command: | docker network create httpd-test-main && - docker run --network httpd-test-main --detach --rm --name oqs-httpd oqs-httpd-img-main && + docker run --network httpd-test-main --detach --rm --name oqs-httpd2 oqs-httpd-img-main && sleep 2 && - docker run --network httpd-test-main oqs-curl-main curl -k https://oqs-httpd:4433 --curves kyber768 + docker run --network httpd-test-main oqs-curl-main curl -k https://oqs-httpd2:4433 --curves kyber768 - when: condition: or: diff --git a/httpd/Dockerfile b/httpd/Dockerfile index 5dc893d9..d41d7e65 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -40,7 +40,8 @@ ARG APRU_VERSION=1.6.3 ARG APR_MIRROR="https://dlcdn.apache.org" # Define the degree of parallelism when building the image; leave the number away only if you know what you are doing -ARG MAKE_DEFINES="-j 2" +# A CI system with less than 4 cores should be avoided +ARG MAKE_DEFINES="-j 4" FROM alpine:${ALPINE_VERSION} as intermediate