wow, I forgot 'checkout scm' step :D it was using the old workspace from
previous version of Jenkinsfile, that was the source of conflict I guess
thanks guys for pointing me the workspace as the source of problem, solved!
On Friday, November 10, 2017 at 8:32:52 PM UTC+1, Ewelina Wilkosz wrote:
>
ok, when I build locally I do not get stack trace, something is messed up
in my Jenkins job or agent :)
On Friday, November 10, 2017 at 8:06:43 PM UTC+1, Ewelina Wilkosz wrote:
>
> right, it does look like a git merge, the thing is, I can't see any
> conflicts in my repo
> so it's just me not
right, it does look like a git merge, the thing is, I can't see any
conflicts in my repo
so it's just me not understanding how docker build works, I guess I will
have to dig more into the issue
On Friday, November 10, 2017 at 6:27:29 PM UTC+1, Mark Waite wrote:
>
> That looks like a failed "git
> On 10. Nov 2017, at 17:12, Ewelina Wilkosz wrote:
>
> And I don't understand where it comes from... Complete newbie here. Anyone
> willing to help with troubleshooting?
Judging from your Dockerfile, I expect that to already be in the file at
That looks like a failed "git merge". No idea of the source of that failed
merge, but those markers are used by git when it can't resolve a merge of a
historical file into the current file.
Mark Waite
On Fri, Nov 10, 2017 at 10:14 AM Ewelina Wilkosz
wrote:
> I'm working
I'm working on dockerizing Configuration as Code plugin, which means I
create a docker image, based on jenkins:2.60.3, I build the plugin and I
install it in a
Dockerfile:
https://github.com/jenkinsci/configuration-as-code-plugin/blob/praqma/dev/Dockerfile
It seems to be working, but I get