Skip to content
Snippets Groups Projects
Unverified Commit 0d33e4fc authored by Diego Sampaio's avatar Diego Sampaio Committed by GitHub
Browse files

Regression: Fix micro services Docker build (#25193)

parent 977cd70d
No related branches found
No related tags found
No related merge requests found
packages/core-typings/* @RocketChat/chat-engine /packages/* @RocketChat/chat-engine
.vscode/* @RocketChat/chat-engine /packages/core-typings/ @RocketChat/chat-engine
.github/* @RocketChat/chat-engine /.vscode/ @RocketChat/chat-engine
/.github/ @RocketChat/chat-engine
...@@ -847,7 +847,8 @@ jobs: ...@@ -847,7 +847,8 @@ jobs:
docker build \ docker build \
--build-arg SERVICE=${{ matrix.service }} \ --build-arg SERVICE=${{ matrix.service }} \
-t rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} \ -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} docker push rocketchat/${{ matrix.service }}-service:${IMAGE_TAG}
......
This diff is collapsed.
nodeLinker: node-modules 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 yarnPath: .yarn/releases/yarn-3.2.0.cjs
...@@ -5,9 +5,23 @@ WORKDIR /app ...@@ -5,9 +5,23 @@ WORKDIR /app
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y build-essential git && 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 FROM node:14-alpine
...@@ -15,15 +29,29 @@ ARG SERVICE ...@@ -15,15 +29,29 @@ ARG SERVICE
WORKDIR /app 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/ 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 \ ENV NODE_ENV=production \
PORT=3000 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 EXPOSE 3000 9458
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment