StackStorm/st2-dockerfiles

Build fails since nginx conf was updated

amanda11 opened this issue · 0 comments

3 out of 4 hunks FAILED -- saving rejects to file /etc/nginx/conf.d/st2-http.template.rej
The command '/bin/sh -c if [ "${ST2_VERSION#*dev}" != "${ST2_VERSION}" ]; then     ST2_BRANCH=master;   else     ST2_BRANCH=v${ST2_VERSION%.*};   fi   && echo ST2_BRANCH=${ST2_BRANCH}   && apt-get install -y patch gettext-base   && curl -sf https://raw.githubusercontent.com/StackStorm/st2/${ST2_BRANCH}/conf/nginx/st2.conf -o /etc/nginx/conf.d/st2-http.template   && cp /etc/nginx/conf.d/st2-http.template /etc/nginx/conf.d/st2-https.template   && patch /etc/nginx/conf.d/st2-http.template < /tmp/st2.conf-http.patch   && patch /etc/nginx/conf.d/st2-https.template < /tmp/st2.conf-https.patch   && rm -f /etc/nginx/conf.d/default.conf   && rm -f /tmp/st2.conf.patch   && rm -f /tmp/st2.conf-http.patch   && rm -f /tmp/st2.conf-https.patch' returned a non-zero code: 1

It looks to have started failing when the nginx conf.d was changed. Patch files in st2-dockerfiles need updating.