Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix PR Docker image creation by splitting in two build jobs #11107

Merged
merged 1 commit into from
Jun 12, 2018
Merged

Fix PR Docker image creation by splitting in two build jobs #11107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,9 @@ jobs:
rm Rocket.Chat.tar.gz

export CIRCLE_TAG=${CIRCLE_TAG:=}
export CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"

docker login -u $DOCKER_USER -p $DOCKER_PASS

if [[ $CIRCLE_TAG ]]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS

docker build -t rocketchat/rocket.chat:latest .
docker push rocketchat/rocket.chat:latest

Expand All @@ -295,20 +293,47 @@ jobs:
exit 0
fi;

if [[ $CIRCLE_PR_NUMBER ]]; then
docker build -t rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER .
docker push rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER
if [[ $CIRCLE_BRANCH == 'develop' ]]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS

docker build -t rocketchat/rocket.chat:develop .
docker push rocketchat/rocket.chat:develop

exit 0
fi;

if [[ $CIRCLE_BRANCH == 'develop' ]]; then
docker build -t rocketchat/rocket.chat:develop .
docker push rocketchat/rocket.chat:develop
pr-image-build:
<<: *defaults

docker:
- image: docker:17.05.0-ce-git

steps:
- attach_workspace:
at: /tmp

- checkout

- setup_remote_docker

- run:
name: Build Docker image for PRs
command: |
export CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"
if [[ -z $CIRCLE_PR_NUMBER ]]; then
exit 0
fi;

cd /tmp/build
cp ~/repo/.docker/Dockerfile .
tar xzf Rocket.Chat.tar.gz
rm Rocket.Chat.tar.gz

docker login -u $DOCKER_USER -p $DOCKER_PASS

docker build -t rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER .
docker push rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER

workflows:
version: 2
build-and-test:
Expand Down