Compare commits

...

2 Commits

Author SHA1 Message Date
e6bc38c7e5 2.4.15 2017-08-26 12:54:25 +02:00
da3ee27d05 update to notice missing gitlab registry token 2017-08-26 12:54:24 +02:00
3 changed files with 7 additions and 7 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
{ {
"name": "npmci", "name": "npmci",
"version": "2.4.14", "version": "2.4.15",
"description": "node and docker in gitlab ci on steroids", "description": "node and docker in gitlab ci on steroids",
"main": "dist/index.js", "main": "dist/index.js",
"typings": "dist/index.d.ts", "typings": "dist/index.d.ts",

View File

@@ -161,14 +161,14 @@ export class Dockerfile {
baseImage: string baseImage: string
localBaseImageDependent: boolean localBaseImageDependent: boolean
localBaseDockerfile: Dockerfile localBaseDockerfile: Dockerfile
constructor(options: { filePath?: string, fileContents?: string | Buffer, read?: boolean }) { constructor (options: { filePath?: string, fileContents?: string | Buffer, read?: boolean }) {
this.filePath = options.filePath this.filePath = options.filePath
this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo
this.version = dockerFileVersion(plugins.path.parse(options.filePath).base) this.version = dockerFileVersion(plugins.path.parse(options.filePath).base)
this.cleanTag = this.repo + ':' + this.version this.cleanTag = this.repo + ':' + this.version
this.buildTag = this.cleanTag this.buildTag = this.cleanTag
this.gitlabTestTag = getDockerTagString('registry.gitlab.com', this.repo, this.version, 'test') this.gitlabTestTag = getDockerTagString('docker.io', this.repo, this.version, 'test') // TODO: using docker.io until gitlab is fixed
this.gitlabReleaseTag = getDockerTagString('registry.gitlab.com', this.repo, this.version) this.gitlabReleaseTag = getDockerTagString('docker.io', this.repo, this.version) // TODO: using docker.io until gitlab is fixed
// the releaseTag determines where the image gets released // the releaseTag determines where the image gets released
this.releaseTag = getDockerTagString('docker.io', this.repo, this.version) this.releaseTag = getDockerTagString('docker.io', this.repo, this.version)