Thanks for replying. I understand that “—no-edit” would prevent git from asking for a commit message. And indeed this is the case if I do it manually.
But I do get your point about working in a clean environment... I think I’ll go for that, don’t want anti-patterns happening here. Thanks! David On Tue, 17 Nov 2020 at 15:26, 'Björn Pedersen' via Jenkins Users < [email protected]> wrote: > Hi, > > this seems like you are mis-using git here. For deploy, checkout into a > clean workspace and do the build. What happens in your case is, that the > pull creates a merge commit ( you want fast-forwards only for automated > updates in most cases), so thats why git wants a merge commit message. ( > you could get around by specifiing a message, but I would advise against > it.) > > Björn > > [email protected] schrieb am Dienstag, 17. November 2020 um 15:26:14 > UTC+1: > >> Hello, >> >> I have the following simple script. I just want to connect via ssh to my >> build server, "git pull" and just build the docker and push it to the >> registry. >> >> (If i don't include the "git pull --no-edit", it works fine) >> >> I just want to do "git pull". But when there are changed being pulled, >> git gives me a "commit message" editor, and won't let me continue until i >> enter something.This blocks me from automatically deploying, so i'm trying >> with "--no-edit" but the deployment gets stuck there for some reason (i i >> do it manually, works properly) >> >> YML_FILES="eks/" >> YML_PATH="infra-api-server-deployment.yaml" >> DOCKER_PATH="/api-server" >> IMAGE_NAME="api-server" >> cd $DOCKER_PATH >> git pull --no-edit *<---- STUCK HERE* >> docker build -t $IMAGE_NAME:$NEW_VER . >> docker push $IMAGE_NAME:$NEW_VER >> cd $YML_FILES >> kubectl apply -f $YML_PATH >> >> Help would be greatly appreciated! >> >> David >> >> >> -- > You received this message because you are subscribed to a topic in the > Google Groups "Jenkins Users" group. > To unsubscribe from this topic, visit > https://groups.google.com/d/topic/jenkinsci-users/IH0D0_ZFdhU/unsubscribe. > To unsubscribe from this group and all its topics, send an email to > [email protected]. > To view this discussion on the web visit > https://groups.google.com/d/msgid/jenkinsci-users/b08ac8f5-ee9f-4f23-8a5c-f489db47ab23n%40googlegroups.com > <https://groups.google.com/d/msgid/jenkinsci-users/b08ac8f5-ee9f-4f23-8a5c-f489db47ab23n%40googlegroups.com?utm_medium=email&utm_source=footer> > . > -- DVG -- Imagination is more important than knowledge Albert Einstein -- You received this message because you are subscribed to the Google Groups "Jenkins Users" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-users/CAPTi0gp%2BvYMLcjn%3DN%2BChonUjHAa%3DnHjDV%3DE1KPYSNDuxL6Hduw%40mail.gmail.com.
