Configure default reconciliation strategy

was failing for ubuntu demanding that a strategy be specified. alpine was still fine, likely using an older git client still. Signed-off-by: Taylor Silva <tsilva@pivotal.io>
concourse · Oct 25, 2021 · 86acbd3 · 86acbd3
1 parent 5c93484
commit 86acbd3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/dockerfiles/alpine/Dockerfile b/dockerfiles/alpine/Dockerfile
@@ -31,6 +31,7 @@ RUN git clone https://github.com/proxytunnel/proxytunnel.git && \
 
 RUN git config --global user.email "git@localhost"
 RUN git config --global user.name "git"
+RUN git config --global pull.rebase "false"
 
 ADD assets/ /opt/resource/
 RUN chmod +x /opt/resource/*

diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_image
+ARG base_image=ubuntu:bionic
 
 FROM ${base_image} AS resource
 
@@ -34,6 +34,7 @@ RUN git clone https://github.com/proxytunnel/proxytunnel.git && \
 
 RUN git config --global user.email "git@localhost"
 RUN git config --global user.name "git"
+RUN git config --global pull.rebase "false"
 
 ADD assets/ /opt/resource/
 RUN chmod +x /opt/resource/*