Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
packages/core-typings/* @RocketChat/chat-engine
.vscode/* @RocketChat/chat-engine
.github/* @RocketChat/chat-engine
/packages/* @RocketChat/chat-engine
/packages/core-typings/ @RocketChat/chat-engine
/.vscode/ @RocketChat/chat-engine
/.github/ @RocketChat/chat-engine
3 changes: 2 additions & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,8 @@ jobs:
docker build \
--build-arg SERVICE=${{ matrix.service }} \
-t rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} \
./apps/meteor/ee/server/services
-f ./apps/meteor/ee/server/services/Dockerfile \
.

docker push rocketchat/${{ matrix.service }}-service:${IMAGE_TAG}

Expand Down
28 changes: 28 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-3.2.0.cjs
38 changes: 33 additions & 5 deletions apps/meteor/ee/server/services/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,53 @@ WORKDIR /app
RUN apt-get update \
&& apt-get install -y build-essential git

ADD ./package.json .
COPY ./package.json .
COPY ./yarn.lock .
COPY ./.yarnrc.yml .
COPY ./.yarn/plugins .yarn/plugins
COPY ./.yarn/releases .yarn/releases

RUN npm install --production
COPY ./packages/core-typings packages/core-typings
COPY ./packages/rest-typings packages/rest-typings

COPY ./apps/meteor/ee/server/services apps/meteor/ee/server/services

RUN yarn install

COPY ./tsconfig.base.json .

RUN yarn workspace @rocket.chat/core-typings run build \
&& yarn workspace @rocket.chat/rest-typings run build

FROM node:14-alpine

ARG SERVICE

WORKDIR /app

COPY --from=build /app .
COPY --from=build /app/packages/core-typings/package.json /app/packages/core-typings/package.json
COPY --from=build /app/packages/core-typings/dist /app/packages/core-typings/dist

COPY --from=build /app/packages/rest-typings/package.json /app/packages/rest-typings/package.json
COPY --from=build /app/packages/rest-typings/dist /app/packages/rest-typings/dist

# add dist/ folder from tsc so we don't need to add all rocket.chat repo
ADD ./dist .
COPY ./apps/meteor/ee/server/services/dist ./apps/meteor/

COPY ./package.json .
COPY ./yarn.lock .
COPY ./.yarnrc.yml .
COPY ./.yarn/plugins .yarn/plugins
COPY ./.yarn/releases .yarn/releases
COPY ./apps/meteor/ee/server/services/package.json ./apps/meteor/ee/server/services/package.json

ENV NODE_ENV=production \
PORT=3000

WORKDIR /app/ee/server/services/${SERVICE}
WORKDIR /app/apps/meteor/ee/server/services
RUN yarn workspaces focus --production

WORKDIR /app/apps/meteor/ee/server/services/${SERVICE}

EXPOSE 3000 9458

Expand Down