From d4d3fbc1ea89c24e576539615e9ef7c8d0880b2d Mon Sep 17 00:00:00 2001
From: Raul Barreras <rbarreras@nebraska.edu>
Date: Wed, 18 Sep 2019 22:29:07 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c50d9ef..483fef2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,12 @@ stages:
- publish
- security
-cache:
- key: ${CI_COMMIT_REF_SLUG}
+cache:
+ key: ${CI_COMMIT_REF_SLUG}
+ paths:
+ - t/dependency-check/simple-app/node_modules/
+ - t/dependency-check/simple-app/dependency_check_results/
+ policy: pull-push
.Check Makefile:
stage: verify
@@ -45,11 +49,6 @@ Test Dependency Checker npm install:
tags:
- docker
image: node:alpine
- cache:
- cache:
- paths:
- - t/dependency-check/simple-app/node_modules/
- - t/dependency-check/simple-app/dependency_check_results/
script:
- cd t/dependency-check/simple-app/
- npm install
@@ -57,16 +56,10 @@ Test Dependency Checker npm install:
Test Dependency Checker dependency_check:
stage: test:dependency_checker
tags:
- - docker
+ - dockerd
image: its-registry.unl.edu/unl-its/docker-ci/dependency-check
- cache:
- paths:
- - t/dependency-check/simple-app/node_modules/
- - t/dependency-check/simple-app/dependency_check_results/
script:
- - ls -al
- - /usr/local/bin/entrypoint.sh
-
+ - docker run --rm -v "${PWD}/t/dependency-check/simple-app:/work" -w /work -e DEPENDENCY_CHECK_OUT_DIR=./dependency_check_results its-registry.unl.edu/unl-its/docker-ci/dependency-check
.Test Dependency Checker:
stage: test
--
GitLab