Skip to content

Commit

Permalink
Merge pull request #8862 from RocketChat/fix-docker-build
Browse files Browse the repository at this point in the history
Fix Docker image build
  • Loading branch information
rodrigok authored Nov 14, 2017
2 parents 7ea35d8 + 80bdacf commit 8e6a4a8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 28 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ workflows:
branches:
only:
- develop
- circle-ci
tags:
only:
- "/^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$/"
28 changes: 3 additions & 25 deletions .circleci/update-releases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,6 @@
set -euvo pipefail
IFS=$'\n\t'

if [[ $RC_RELEASE = "develop" ]]; then
aws s3api put-object \
--acl public-read \
--website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz" \
--bucket download.rocket.chat \
--key "build/rocket.chat-$RC_VERSION.tgz"

aws s3api put-object \
--acl public-read \
--website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz.asc" \
--bucket download.rocket.chat \
--key "build/rocket.chat-$RC_VERSION.tgz.asc"
fi

aws s3api put-object \
--acl public-read \
--website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz" \
--bucket download.rocket.chat \
--key "$RC_RELEASE"

aws s3api put-object \
--acl public-read \
--website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz.asc" \
--bucket download.rocket.chat \
--key "$RC_RELEASE.asc"
curl -X POST \
-H "X-Update-Token: ${UPDATE_TOKEN}" \
https://releases.rocket.chat/update
4 changes: 2 additions & 2 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ENV RC_VERSION 0.60.0-develop
MAINTAINER buildmaster@rocket.chat

RUN set -x \
&& curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz" -o rocket.chat.tgz \
&& curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz.asc" -o rocket.chat.tgz.asc \
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download/" -o rocket.chat.tgz \
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
&& gpg --verify rocket.chat.tgz.asc \
&& mkdir -p /app \
&& tar -zxf rocket.chat.tgz -C /app \
Expand Down

0 comments on commit 8e6a4a8

Please sign in to comment.