Merge remote-tracking branch 'upstream/release53' into bbc-release53

Author: PeterC89

meteor/Dockerfile

@@ -62,4 +62,4 @@ COPY meteor/docker-entrypoint.sh /opt
 WORKDIR /opt/core/
 RUN chown -R 1000:1000 /opt/core
 USER 1000
-CMD ["/opt/docker-entrypoint.sh"]
+ENTRYPOINT ["/opt/docker-entrypoint.sh"]

meteor/Dockerfile.circle

@@ -8,4 +8,4 @@ COPY meteor/docker-entrypoint.sh /opt
 WORKDIR /opt/core
 RUN chown -R 1000:1000 /opt/core
 USER 1000
-CMD ["/opt/docker-entrypoint.sh"]
+ENTRYPOINT ["/opt/docker-entrypoint.sh"]

packages/.yarnrc.yml

@@ -1 +1,5 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 nodeLinker: node-modules

packages/documentation/docs/user-guide/installation/installing-sofie-server-core.md

@@ -75,7 +75,10 @@ services:
   spreadsheet-gateway:
     image: superflytv/sofie-spreadsheet-gateway:latest
     restart: always
-    command: yarn start -host core -port 3000 -id spreadsheetGateway0
+    environment:
+      DEVICE_ID: spreadsheetGateway0
+      CORE_HOST: core
+      CORE_PORT: '3000'
     networks:
       - sofie
     depends_on:
@@ -86,10 +89,13 @@ services:
     image: sofietv/tv-automation-mos-gateway:release51
     restart: always
     ports:
-      - "10540:10540" # MOS Lower port
-      - "10541:10541" # MOS Upper port
+      - '10540:10540' # MOS Lower port
+      - '10541:10541' # MOS Upper port
       # - "10542:10542" # MOS query port - not used
-    command: yarn start -host core -port 3000 -id mosGateway0
+    environment:
+      DEVICE_ID: mosGateway0
+      CORE_HOST: core
+      CORE_PORT: '3000'
     networks:
       - sofie
     depends_on:

packages/live-status-gateway/Dockerfile

@@ -31,4 +31,4 @@ COPY --from=0 /opt/corelib /opt/corelib
 WORKDIR /opt/live-status-gateway
 RUN chown -R 1000:1000 /opt/live-status-gateway
 USER 1000
-CMD ["node", "dist/index.js"]
+ENTRYPOINT ["node", "dist/index.js"]

packages/live-status-gateway/Dockerfile.circle

@@ -13,4 +13,4 @@ COPY corelib /opt/corelib
 WORKDIR /opt/live-status-gateway
 RUN chown -R 1000:1000 /opt/live-status-gateway
 USER 1000
-CMD ["node", "dist/index.js"]
+ENTRYPOINT ["node", "dist/index.js"]

packages/mos-gateway/Dockerfile

@@ -9,7 +9,6 @@ RUN corepack enable
 RUN yarn install --immutable
 RUN yarn run pinst --disable
 RUN yarn lerna run --scope \*\*/mos-gateway --include-dependencies --stream build
-RUN yarn plugin import workspace-tools
 RUN yarn workspaces focus mos-gateway --production # purge dev-dependencies
 
 # DEPLOY IMAGE
@@ -25,4 +24,4 @@ COPY --from=0 /opt/shared-lib /opt/shared-lib
 WORKDIR /opt/mos-gateway
 RUN chown -R 1000:1000 /opt/mos-gateway
 USER 1000
-CMD ["node", "dist/index.js"]
+ENTRYPOINT ["node", "dist/index.js"]

packages/mos-gateway/Dockerfile.circle

@@ -10,4 +10,4 @@ COPY shared-lib /opt/shared-lib
 WORKDIR /opt/mos-gateway
 RUN chown -R 1000:1000 /opt/mos-gateway
 USER 1000
-CMD ["node", "dist/index.js"]
+ENTRYPOINT ["node", "dist/index.js"]

packages/playout-gateway/Dockerfile

@@ -9,7 +9,6 @@ RUN corepack enable
 RUN yarn install --immutable
 RUN yarn run pinst --disable
 RUN yarn lerna run --scope \*\*/playout-gateway --include-dependencies --stream build
-RUN yarn plugin import workspace-tools
 RUN yarn workspaces focus playout-gateway --production # purge dev-dependencies
 
 # DEPLOY IMAGE
@@ -25,4 +24,4 @@ COPY --from=0 /opt/shared-lib /opt/shared-lib
 WORKDIR /opt/playout-gateway
 RUN chown -R 1000:1000 /opt/playout-gateway
 USER 1000
-CMD ["node", "dist/index.js"]
+ENTRYPOINT ["node", "dist/index.js"]

packages/playout-gateway/Dockerfile.circle

@@ -10,4 +10,4 @@ COPY shared-lib /opt/shared-lib
 WORKDIR /opt/playout-gateway
 RUN chown -R 1000:1000 /opt/playout-gateway
 USER 1000
-CMD ["node", "dist/index.js"]
+ENTRYPOINT ["node", "dist/index.js"]