diff --git a/.gitignore b/.gitignore index e713ab4..91c0db0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,12 @@ pages/ # installs node_modules/ -# caches and builds +# caches .yarn/ .cache/ +.rpt2_cache + +# builds dist/ dist_web/ dist_serve/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 734a965..63b309d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,19 +78,11 @@ release: # ==================== codequality: stage: metadata - image: docker:stable allow_failure: true - services: - - docker:stable-dind script: - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SOURCE_CODE="$PWD" - --volume "$PWD":/code - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code - artifacts: - paths: [codeclimate.json] + - npmci command npm install -g tslint typescript + - npmci npm install + - npmci command "tslint -c tslint.json ./ts/**/*.ts" tags: - docker - priv @@ -109,10 +101,10 @@ pages: image: hosttoday/ht-docker-node:npmci stage: metadata script: - - npmci command npm install -g typedoc typescript + - npmci command npm install -g @gitzone/tsdoc - npmci npm prepare - npmci npm install - - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ + - npmci command tsdoc tags: - docker - notpriv diff --git a/package.json b/package.json index c7a7185..d7f3b3d 100644 --- a/package.json +++ b/package.json @@ -63,4 +63,4 @@ "npmextra.json", "readme.md" ] -} +} \ No newline at end of file diff --git a/ts/mod_docker/mod.classes.dockerfile.ts b/ts/mod_docker/mod.classes.dockerfile.ts index 7967252..c38ab0d 100644 --- a/ts/mod_docker/mod.classes.dockerfile.ts +++ b/ts/mod_docker/mod.classes.dockerfile.ts @@ -42,9 +42,7 @@ export class Dockerfile { public async build() { logger.log('info', 'now building Dockerfile for ' + this.cleanTag); const buildArgsString = await helpers.getDockerBuildArgs(); - const buildCommand = `docker build -t ${this.buildTag} -f ${ - this.filePath - } ${buildArgsString} .`; + const buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`; await bash(buildCommand); return; } @@ -86,9 +84,7 @@ export class Dockerfile { if (testFileExists) { // run tests await bash( - `docker run --name npmci_test_container --entrypoint="bash" ${ - this.buildTag - } -c "mkdir /npmci_test"` + `docker run --name npmci_test_container --entrypoint="bash" ${this.buildTag} -c "mkdir /npmci_test"` ); await bash(`docker cp ${testFile} npmci_test_container:/npmci_test/test.sh`); await bash(`docker commit npmci_test_container npmci_test_image`);