From 2cdcf30d60e614347a3309a6b72500e9ed48fac1 Mon Sep 17 00:00:00 2001
From: Ulf Seltmann <seltmann@ub.uni-leipzig.de>
Date: Tue, 19 Dec 2017 16:46:15 +0100
Subject: [PATCH] fixed .gitlab-ci.yml fixed .dockerignore
---
.dockerignore | 25 +------------------------
.gitlab-ci.yml | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 34abd86..f59ec20 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,24 +1 @@
-.tmp
-.vscode
-bin
-coverage
-data
-dist
-docs
-node_modules
-public
-site
-src
-test
-.dockerignore
-.gitignore
-.gitlab-ci.yml
-.npmignore
-docker-compose.yml
-Dockerfile
-mkdocs.yml
-package-lock.json
-package.json
-Readme.md
-tsconfig.json
-webpack.*
\ No newline at end of file
+*
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fc0326..ac79738 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,33 +10,36 @@ variables:
npm_install:
stage: build_app
- image: node:8-alpine
+ image:
+ name: node:8-alpine
+ entrypoint: ["/bin/su", "node", "-c"]
script:
- test -d .npm && mv .npm ${HOME}
- npm run build
- - npm run ci
- mv ${HOME}/.npm .
cache:
key: "${CI_PROJECT_ID}"
paths:
- .npm
- - public
+ - lib
- node_modules
- - dist
- public
+ - test
tags:
- docker
npm_ci:
stage: test_app
- image: node:8-alpine
+ image:
+ name: node:8-alpine
+ entrypoint: ["/bin/su", "node", "-c"]
script:
- npm run ci
cache:
key: "${CI_PROJECT_ID}"
paths:
- .npm
- - dist
+ - lib
- public
tags:
- docker
@@ -45,7 +48,9 @@ npm_publish:
stage: publish_app
only:
- master
- image: node:8-alpine
+ image:
+ name: node:8-alpine
+ entrypoint: ["/bin/su", "node", "-c"]
script:
- 'echo "//services.ub.uni-leipzig.de/nexus/repository/npm-ubl/:_authToken=${NPM_TOKEN}" > ~/.npmrc'
- npm publish
--
GitLab