Jenkinsfile: remove redundant -f Dockerfile

thaJeztah · thaJeztah · commit 9d949acd3e52 · 2019-10-07T23:52:53.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
(cherry picked from commit 64b3d12686e1a4ad4669e8c195cacafd76ea265c)
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
Upstream-commit: 646e7a52396ab226e9b81da8c4c12b6aa4fa2b3f
Component: engine
diff --git a/components/engine/Jenkinsfile b/components/engine/Jenkinsfile
@@ -382,7 +382,7 @@ pipeline {
                         stage("Build dev image") {
                             steps {
                                 sh '''
-                                docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .
+                                docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
                                 '''
                             }
                         }
@@ -486,7 +486,7 @@ pipeline {
                         stage("Build dev image") {
                             steps {
                                 sh '''
-                                docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .
+                                docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
                                 '''
                             }
                         }
@@ -567,7 +567,7 @@ pipeline {
                         }
                         stage("Build dev image") {
                             steps {
-                                sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .'
+                                sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .'
                             }
                         }
                         stage("Unit tests") {
@@ -669,7 +669,7 @@ pipeline {
                         }
                         stage("Build dev image") {
                             steps {
-                                sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .'
+                                sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .'
                             }
                         }
                         stage("Integration-cli tests") {

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ pipeline {`
`382`	`382`	`stage("Build dev image") {`
`383`	`383`	`steps {`
`384`	`384`	`sh '''`
`385`		`- docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .`
	`385`	`+ docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .`
`386`	`386`	`'''`
`387`	`387`	`}`
`388`	`388`	`}`
`@@ -486,7 +486,7 @@ pipeline {`
`486`	`486`	`stage("Build dev image") {`
`487`	`487`	`steps {`
`488`	`488`	`sh '''`
`489`		`- docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .`
	`489`	`+ docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .`
`490`	`490`	`'''`
`491`	`491`	`}`
`492`	`492`	`}`
`@@ -567,7 +567,7 @@ pipeline {`
`567`	`567`	`}`
`568`	`568`	`stage("Build dev image") {`
`569`	`569`	`steps {`
`570`		`- sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .'`
	`570`	`+ sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .'`
`571`	`571`	`}`
`572`	`572`	`}`
`573`	`573`	`stage("Unit tests") {`
`@@ -669,7 +669,7 @@ pipeline {`
`669`	`669`	`}`
`670`	`670`	`stage("Build dev image") {`
`671`	`671`	`steps {`
`672`		`- sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .'`
	`672`	`+ sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .'`
`673`	`673`	`}`
`674`	`674`	`}`
`675`	`675`	`stage("Integration-cli tests") {`