Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into heic
Browse files Browse the repository at this point in the history
* 'develop' of github.com:RocketChat/Rocket.Chat: (294 commits)
  Chore: Convert UserCardWithData to ts (#26192)
  Chore: cleanup startup of test and put wizard in setup function (#26306)
  Chore: Convert AccountPreferencesPage to ts (#26096)
  [FIX] Missing bio field UI validation (#26345)
  Chore: Remove square prop from IconButton (#26343)
  Chore: Rewrite VerticalBarOldActions to TS (#26277)
  Chore: Replace direct multiple icon (#26342)
  Chore: Upgrade ESLint (#26132)
  Chore: convert autotranslate to ts (#25953)
  Chore: Change some places still using fields to projection (#26308)
  Bump version to 5.1.0-develop
  Bump version to 5.0.0
  Bump version to 5.0.0-rc.12
  Regression: Livechat not rendering UiKit messages with action buttons (#26327)
  Chore: bump fuselage packages (#26325)
  Chore: Update useSidebarPalette selectors (#26322)
  Regression: Fix get myself user data (#26328)
  Bump version to 5.0.0-rc.11
  Bump version to 4.8.2
  Regression: fix `directory` endpoint not listing teams (#26310)
  ...
  • Loading branch information
gabriellsh committed Jul 26, 2022
2 parents 0fb0a67 + 45ee02d commit 75fbdde
Show file tree
Hide file tree
Showing 2,283 changed files with 63,058 additions and 42,521 deletions.
69 changes: 69 additions & 0 deletions .github/actions/build-docker-image-service/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: 'Build Micro Services Docker image'
description: 'Build Rocket.Chat Micro Services Docker images'

inputs:
docker-tag:
required: true
service:
required: true
username:
required: false
password:
required: false

outputs:
image-name:
value: ${{ steps.build-image.outputs.image-name }}

runs:
using: "composite"
steps:
# - shell: bash
# name: Free disk space
# run: |
# sudo swapoff -a
# sudo rm -f /swapfile
# sudo apt clean
# docker rmi $(docker image ls -aq)
# df -h

- shell: bash
id: build-image
run: |
LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
IMAGE_TAG="${{ inputs.docker-tag }}"
IMAGE_NAME="ghcr.io/${LOWERCASE_REPOSITORY}/${{ inputs.service }}-service:${IMAGE_TAG}"
echo "Building Docker image for service: ${{ inputs.service }}:${IMAGE_TAG}"
if [[ "${{ inputs.service }}" == "ddp-streamer" ]]; then
DOCKERFILE_PATH="./ee/apps/ddp-streamer/Dockerfile"
else
DOCKERFILE_PATH="./apps/meteor/ee/server/services/Dockerfile"
fi
docker build \
--build-arg SERVICE=${{ inputs.service }} \
-t ${IMAGE_NAME} \
-f ${DOCKERFILE_PATH} \
.
echo "::set-output name=image-name::${IMAGE_NAME}"
- name: Login to GitHub Container Registry
if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop'
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ inputs.username }}
password: ${{ inputs.password }}

- name: Publish image
shell: bash
if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop'
run: |
echo "Push Docker image: ${{ steps.build-image.outputs.image-name }}"
docker push ${{ steps.build-image.outputs.image-name }}
88 changes: 88 additions & 0 deletions .github/actions/build-docker-image/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: 'Build Docker image'
description: 'Build Rocket.Chat Docker image'

inputs:
root-dir:
required: true
docker-tag:
required: true
release:
required: true
username:
required: false
password:
required: false

outputs:
image-name:
value: ${{ steps.build-image.outputs.image-name }}

runs:
using: composite
steps:
# - shell: bash
# name: Free disk space
# run: |
# sudo swapoff -a
# sudo rm -f /swapfile
# sudo apt clean
# docker rmi $(docker image ls -aq)
# df -h

- shell: bash
id: build-image
run: |
cd ${{ inputs.root-dir }}
LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
IMAGE_NAME_BASE="ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${{ inputs.docker-tag }}"
IMAGE_NAME="${IMAGE_NAME_BASE}.${{ inputs.release }}"
echo "Build Docker image ${IMAGE_NAME}"
DOCKER_PATH="${GITHUB_WORKSPACE}/apps/meteor/.docker"
if [[ '${{ inputs.release }}' = 'preview' ]]; then
DOCKER_PATH="${DOCKER_PATH}-mongo"
fi;
DOCKERFILE_PATH="${DOCKER_PATH}/Dockerfile"
if [[ '${{ inputs.release }}' = 'alpine' ]]; then
DOCKERFILE_PATH="${DOCKERFILE_PATH}.${{ inputs.release }}"
fi;
echo "Copy Dockerfile for release: ${{ inputs.release }}"
cp $DOCKERFILE_PATH ./Dockerfile
if [ -e ${DOCKER_PATH}/entrypoint.sh ]; then
cp ${DOCKER_PATH}/entrypoint.sh .
fi;
echo "Build ${{ inputs.release }} Docker image"
docker build -t $IMAGE_NAME .
echo "::set-output name=image-name-base::${IMAGE_NAME_BASE}"
echo "::set-output name=image-name::${IMAGE_NAME}"
- name: Login to GitHub Container Registry
if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop'
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ inputs.username }}
password: ${{ inputs.password }}

- name: Publish image
shell: bash
if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop'
run: |
echo "Push Docker image: ${{ steps.build-image.outputs.image-name }}"
docker push ${{ steps.build-image.outputs.image-name }}
if [[ '${{ inputs.release }}' = 'official' ]]; then
echo "Push release official without variant"
docker tag ${{ steps.build-image.outputs.image-name }} ${{ steps.build-image.outputs.image-name-base }}
docker push ${{ steps.build-image.outputs.image-name-base }}
fi;
7 changes: 7 additions & 0 deletions .github/history-manual.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,5 +189,12 @@
"contributors": [
"ggazzo"
]
}],
"4.8.2": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "sampaiodiego",
"contributors": [
"sampaiodiego"
]
}]
}
Loading

0 comments on commit 75fbdde

Please sign in to comment.