Make sure lifecycle scripts run as may require for arm

RocketChat · Nov 16, 2023 · 4a848b9 · 4a848b9
1 parent 19b0993
commit 4a848b9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 13 deletions.
diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine
@@ -6,22 +6,12 @@ COPY dist /app
 
 LABEL maintainer="buildmaster@rocket.chat"
 
+# TODO: use non-root user
+
 RUN set -x \
     && apk add --no-cache --virtual .fetch-deps python3 make g++ libc6-compat \
     && cd /app/bundle/programs/server \
-    && npm install --production \
-    # Start hack for sharp...
-    && rm -rf npm/node_modules/sharp \
-    && npm install sharp@0.30.4 \
-    && mv node_modules/sharp npm/node_modules/sharp \
-    # End hack for sharp
-    # Start hack for isolated-vm...
-    && rm -rf npm/node_modules/isolated-vm \
-    && npm install isolated-vm@4.4.2 \
-    && mv node_modules/isolated-vm npm/node_modules/isolated-vm \
-    # End hack for isolated-vm
-    && cd npm \
-    && npm rebuild bcrypt --build-from-source \
+    && npm install --production --unsafe-perm \
     && npm cache clear --force \
     && apk del .fetch-deps
 

diff --git a/ee/apps/account-service/Dockerfile b/ee/apps/account-service/Dockerfile
@@ -50,6 +50,7 @@ WORKDIR /app/ee/apps/${SERVICE}
 
 RUN apk update && \
     apk --no-cache --virtual build-dependencies add g++ python3 make && \
+    yarn config set unsafe-perm true && \
     yarn workspaces focus --production && \
     rm -rf /var/cache/apk/* && \
     apk del build-dependencies

diff --git a/ee/apps/authorization-service/Dockerfile b/ee/apps/authorization-service/Dockerfile
@@ -50,6 +50,7 @@ WORKDIR /app/ee/apps/${SERVICE}
 
 RUN apk update && \
     apk --no-cache --virtual build-dependencies add g++ python3 make && \
+    yarn config set unsafe-perm true && \
     yarn workspaces focus --production && \
     rm -rf /var/cache/apk/* && \
     apk del build-dependencies

diff --git a/ee/apps/ddp-streamer/Dockerfile b/ee/apps/ddp-streamer/Dockerfile
@@ -59,6 +59,7 @@ WORKDIR /app/ee/apps/${SERVICE}
 
 RUN apk update && \
     apk --no-cache --virtual build-dependencies add g++ python3 make && \
+    yarn config set unsafe-perm true && \
     yarn workspaces focus --production && \
     rm -rf /var/cache/apk/* && \
     apk del build-dependencies

diff --git a/ee/apps/omnichannel-transcript/Dockerfile b/ee/apps/omnichannel-transcript/Dockerfile
@@ -59,6 +59,7 @@ WORKDIR /app/ee/apps/${SERVICE}
 
 RUN apk update && \
     apk --no-cache --virtual build-dependencies add g++ python3 make && \
+    yarn config set unsafe-perm true && \
     yarn workspaces focus --production && \
     rm -rf /var/cache/apk/* && \
     apk del build-dependencies

diff --git a/ee/apps/presence-service/Dockerfile b/ee/apps/presence-service/Dockerfile
@@ -56,6 +56,7 @@ WORKDIR /app/ee/apps/${SERVICE}
 
 RUN apk update && \
     apk --no-cache --virtual build-dependencies add g++ python3 make && \
+    yarn config set unsafe-perm true && \
     yarn workspaces focus --production && \
     rm -rf /var/cache/apk/* && \
     apk del build-dependencies

diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile
@@ -59,6 +59,7 @@ WORKDIR /app/ee/apps/${SERVICE}
 
 RUN apk update && \
     apk --no-cache --virtual build-dependencies add g++ python3 make && \
+    yarn config set unsafe-perm true && \
     yarn workspaces focus --production && \
     rm -rf /var/cache/apk/* && \
     apk del build-dependencies

diff --git a/ee/apps/stream-hub-service/Dockerfile b/ee/apps/stream-hub-service/Dockerfile
@@ -50,6 +50,7 @@ WORKDIR /app/ee/apps/${SERVICE}
 
 RUN apk update && \
     apk --no-cache --virtual build-dependencies add g++ python3 make && \
+    yarn config set unsafe-perm true && \
     yarn workspaces focus --production && \
     rm -rf /var/cache/apk/* && \
     apk del build-dependencies