Skip to content
Snippets Groups Projects
Commit 1e4faa7a authored by Josha Bartsch's avatar Josha Bartsch :headphones:
Browse files

Merge branch 'ci-revision' into 'RWTHmoodle_4.x'

Cleanup, pin dind versions

See merge request !63
parents 78086806 f4de4805
Branches
No related tags found
2 merge requests!63Cleanup, pin dind versions,!55Adjustments for bugfix MDL76309
Pipeline #1043357 passed
image: docker:19.03.1
stages: stages:
- build - build
- deploy - deploy
...@@ -7,8 +5,6 @@ stages: ...@@ -7,8 +5,6 @@ stages:
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
DOCKER_TLS_CERTDIR: "/certs"
DOCKER_HOST: tcp://docker:2376 # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
build: build:
stage: build stage: build
...@@ -38,17 +34,19 @@ tag-latest: ...@@ -38,17 +34,19 @@ tag-latest:
test: test:
stage: test stage: test
image: docker:24
services: services:
- docker:dind - docker:24.0.5-dind
variables:
DOCKER_TLS_CERTDIR: "/certs"
DOCKER_HOST: tcp://docker:2376 # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
script: script:
- mkdir out - mkdir out
- chmod 777 out - chmod 777 out
- docker run --name examscan --rm -v $(pwd):$(pwd) -w $(pwd) ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG} watermark.py tests/assets/pdfs out - docker run --name examscan --rm -v $(pwd):$(pwd) -w $(pwd) ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG} watermark.py tests/assets/pdfs out
artifacts: artifacts:
paths: paths:
- out/ - out/
rules:
- when: never
pages: pages:
image: image:
...@@ -93,4 +91,4 @@ test-docs: ...@@ -93,4 +91,4 @@ test-docs:
only: only:
- branches - branches
except: except:
- master - master
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment