diff --git a/.circleci/config.yml b/.circleci/config.yml index 92207f0277a8..00228de78fd3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -273,7 +273,6 @@ workflows: branches: only: - develop - - circle-ci tags: only: - "/^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$/" diff --git a/.circleci/update-releases.sh b/.circleci/update-releases.sh index 0fd9fb438803..4e133c304fed 100644 --- a/.circleci/update-releases.sh +++ b/.circleci/update-releases.sh @@ -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 diff --git a/.docker/Dockerfile b/.docker/Dockerfile index a4f932164339..091c369ba432 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -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 \