summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Tadeu Panato Junior <ctadeu@gmail.com>2018-03-12 12:39:06 +0100
committerJoram Wilander <jwawilander@gmail.com>2018-03-12 07:39:06 -0400
commit46fea093c8d77da3f3a6e5417632ba686eef8092 (patch)
tree9cfb23e96443a6b677a692b64fd195c82d8f99ab
parent426796829a4a1436c4733ee856d033c02749e64b (diff)
downloadchat-46fea093c8d77da3f3a6e5417632ba686eef8092.tar.gz
chat-46fea093c8d77da3f3a6e5417632ba686eef8092.tar.bz2
chat-46fea093c8d77da3f3a6e5417632ba686eef8092.zip
using inbucket docker image tag release-1.2.0 instead of latest (#8406)
-rw-r--r--Makefile2
-rw-r--r--build/Jenkinsfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c4c0dc68f..451581dd3 100644
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ start-docker: ## Starts the docker containers for local development.
@if [ $(shell docker ps -a | grep -ci mattermost-inbucket) -eq 0 ]; then \
echo starting mattermost-inbucket; \
- docker run --name mattermost-inbucket -p 9000:10080 -p 2500:10025 -d jhillyerd/inbucket:latest > /dev/null; \
+ docker run --name mattermost-inbucket -p 9000:10080 -p 2500:10025 -d jhillyerd/inbucket:release-1.2.0 > /dev/null; \
elif [ $(shell docker ps | grep -ci mattermost-inbucket) -eq 0 ]; then \
echo restarting mattermost-inbucket; \
docker start mattermost-inbucket > /dev/null; \
diff --git a/build/Jenkinsfile b/build/Jenkinsfile
index ebef7ca3d..7eb2fda88 100644
--- a/build/Jenkinsfile
+++ b/build/Jenkinsfile
@@ -31,7 +31,7 @@ podTemplate(label: 'jenkins-slave',
),
containerTemplate(
name: 'mattermost-inbucket',
- image: 'jhillyerd/inbucket:latest',
+ image: 'jhillyerd/inbucket:release-1.2.0',
resourceRequestCpu: '250m',
resourceLimitCpu: '250m',
resourceRequestMemory: '256Mi',