Skip to content
Snippets Groups Projects
Commit fc2b43de authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

Merge branch 'fix-master-pipeline' into 'master' 

Fix pipeline

See merge request openappstack/single-sign-on!37
parents e2b825f6 fc64b1d1
No related branches found
No related tags found
2 merge requests!43Merge master into 0.2 branch,!37Fix pipeline
Pipeline #7314 failed with stages
Stage:
    Stage:
      Stage:
        Stage:
          in 1 minute and 14 seconds
          This commit is part of merge request !43. Comments created here will be created in the context of that merge request.
          Hide whitespace changes
          Inline Side-by-side
          .gitlab-ci.yml
          + 1
          − 1
          Edit View file @ fc2b43de
          ......@@ -87,7 +87,7 @@ behave-integration:
          alias: consent
          - name: ${CI_REGISTRY_IMAGE}/logout_provider:${CI_COMMIT_REF_NAME}
          alias: logout
          - name: oryd/hydra:latest
          - name: docker.io/oryd/hydra:v1.8
          alias: hydra
          command:
          - serve
          ......
          test/integration_tests/Dockerfile
          + 2
          − 0
          Edit View file @ fc2b43de
          ......@@ -10,6 +10,8 @@ RUN apk --no-cache add \
          libc-dev \
          openssl-dev \
          bash \
          rust \
          cargo \
          gcc
          RUN pip3 install --no-cache-dir -r requirements.txt
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment