Merge pull request #1 from stakater/fix/image-version

updats Jenkins file, and removes make & release files
stakater-docker · Sep 13, 2018 · 43eb31e · 43eb31e
2 parents c9d7ea9 + 9512d8c
commit 43eb31e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 248 deletions.
diff --git a/.make-release-support b/.make-release-support
diff --git a/.release b/.release
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,14 +1,6 @@
 #!/usr/bin/env groovy
-@Library('github.com/stakater/fabric8-pipeline-library@image-makefile')
+@Library('github.com/stakater/fabric8-pipeline-library@master') _
 
-def versionPrefix = ""
-try {
-    versionPrefix = VERSION_PREFIX
-} catch (Throwable e) {
-    versionPrefix = "1.0"
-}
-
-pushDockerImageFromMakefile {
-    versionPrefix = versionPrefix
+pushDockerImage{
     dockerRegistryURL = "docker.io"
 }
diff --git a/Makefile b/Makefile
diff --git a/Makefile.mk b/Makefile.mk