Skip to content

Commit

Permalink
Merge 444305d into 3211c2e
Browse files Browse the repository at this point in the history
  • Loading branch information
sukrit007 committed Nov 8, 2016
2 parents 3211c2e + 444305d commit e864cc6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Expand Up @@ -16,7 +16,9 @@ RUN mkdir -p /root/.ssh && chmod 500 /root/.ssh && chown -R root:root /root/.s

# Install Docker
# Docker version might be overridden in supervisord-wrapper if host and client version are different
RUN curl -L -o /usr/local/bin/docker https://get.docker.io/builds/Linux/x86_64/docker-1.8.3
RUN curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-1.12.3.tgz \
&& tar --strip-components=1 -xvzf docker-1.12.3.tgz -C /usr/local/bin

ADD .docker/wrapdocker /usr/local/bin/wrapdocker
RUN chmod +x /usr/local/bin/docker /usr/local/bin/wrapdocker

Expand Down
2 changes: 1 addition & 1 deletion templates/slack.json
@@ -1,7 +1,7 @@
{
"text": " ",
"username": "Image Factory",
"channel": "{{ channel }}",
"channel": "{{ notification.channel }}",
"attachments": [{
"text": "A *{{ ctx.env }}* build for *{{ ctx.repo }}* has failed!\nFor more details, view the <{{ ctx.baseUrl }}/job/{{ ctx.id }}/log|logs>.",
"color": "danger",
Expand Down

0 comments on commit e864cc6

Please sign in to comment.