From 03b50c9ecd4e559c72552b752a5442a7d753818b Mon Sep 17 00:00:00 2001 From: Roberto Sero <> Date: Thu, 5 Sep 2024 12:25:01 +0200 Subject: [PATCH] fix: github test workflow --- .github/workflows/test.yml | 3 +++ Dockerfile | 2 +- docker-compose.yml | 1 - test.sh | 9 ++++----- test/docker-compose.yml | 1 - 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb7ced5..3943b5e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,4 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: docker-practice/actions-setup-docker@master + with: + docker_version: 27.2 - run: bash ./test.sh diff --git a/Dockerfile b/Dockerfile index 0ccd5d6..e770b40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14 +FROM node:20 # USER node WORKDIR /app diff --git a/docker-compose.yml b/docker-compose.yml index ad2e431..f352c87 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.9" services: keygen: image: italia/spid-compliant-certificates:latest diff --git a/test.sh b/test.sh index 88b7904..1798b56 100644 --- a/test.sh +++ b/test.sh @@ -6,12 +6,11 @@ C="./test/docker-compose.yml" DEBUG=${DEBUG:-"WARNING"} function t { - docker-compose -f $C down -v - BINDING=$1 ALG=$2 RAC_COMPARISON=$3 AUTHN_CONTEXT=$4 DEBUG=$DEBUG docker-compose -f $C up --exit-code-from test --no-log-prefix test - # BINDING=$1 ALG=$2 RAC_COMPARISON=$3 AUTHN_CONTEXT=$4 DEBUG=$DEBUG docker-compose -f $C up + docker compose -f $C down -v + BINDING=$1 ALG=$2 RAC_COMPARISON=$3 AUTHN_CONTEXT=$4 DEBUG=$DEBUG docker compose -f $C up --exit-code-from test --no-log-prefix test } -docker-compose -f $C build -q +docker compose -f $C build -q # t HTTP-POST sha256 exact 1 t HTTP-Redirect sha512 minimum 1 @@ -25,4 +24,4 @@ t HTTP-POST sha256 minimum 2 # t HTTP-POST sha256 minimum 3 t HTTP-Redirect sha512 maximum 3 -docker-compose -f $C down -v +docker compose -f $C down -v diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 4e5dca4..9caec98 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.9" services: idp: image: "ghcr.io/italia/spid-sp-test:latest"