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 Docker image build #8862

Merged
merged 1 commit into from
Nov 14, 2017
Merged

Fix Docker image build #8862

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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