Skip to content

Commit 0e27000

Browse files
authored
Merge pull request #1482 from SuperFlyTV/fix/docker-image-entrypoint
2 parents 810daad + 22bc934 commit 0e27000

File tree

10 files changed

+22
-14
lines changed

10 files changed

+22
-14
lines changed

meteor/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ COPY meteor/docker-entrypoint.sh /opt
6262
WORKDIR /opt/core/
6363
RUN chown -R 1000:1000 /opt/core
6464
USER 1000
65-
CMD ["/opt/docker-entrypoint.sh"]
65+
ENTRYPOINT ["/opt/docker-entrypoint.sh"]

meteor/Dockerfile.circle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ COPY meteor/docker-entrypoint.sh /opt
88
WORKDIR /opt/core
99
RUN chown -R 1000:1000 /opt/core
1010
USER 1000
11-
CMD ["/opt/docker-entrypoint.sh"]
11+
ENTRYPOINT ["/opt/docker-entrypoint.sh"]

packages/.yarnrc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: false
4+
15
nodeLinker: node-modules

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ services:
7575
spreadsheet-gateway:
7676
image: superflytv/sofie-spreadsheet-gateway:latest
7777
restart: always
78-
command: yarn start -host core -port 3000 -id spreadsheetGateway0
78+
environment:
79+
DEVICE_ID: spreadsheetGateway0
80+
CORE_HOST: core
81+
CORE_PORT: '3000'
7982
networks:
8083
- sofie
8184
depends_on:
@@ -86,10 +89,13 @@ services:
8689
image: sofietv/tv-automation-mos-gateway:release51
8790
restart: always
8891
ports:
89-
- "10540:10540" # MOS Lower port
90-
- "10541:10541" # MOS Upper port
92+
- '10540:10540' # MOS Lower port
93+
- '10541:10541' # MOS Upper port
9194
# - "10542:10542" # MOS query port - not used
92-
command: yarn start -host core -port 3000 -id mosGateway0
95+
environment:
96+
DEVICE_ID: mosGateway0
97+
CORE_HOST: core
98+
CORE_PORT: '3000'
9399
networks:
94100
- sofie
95101
depends_on:

packages/live-status-gateway/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ COPY --from=0 /opt/corelib /opt/corelib
3131
WORKDIR /opt/live-status-gateway
3232
RUN chown -R 1000:1000 /opt/live-status-gateway
3333
USER 1000
34-
CMD ["node", "dist/index.js"]
34+
ENTRYPOINT ["node", "dist/index.js"]

packages/live-status-gateway/Dockerfile.circle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ COPY corelib /opt/corelib
1313
WORKDIR /opt/live-status-gateway
1414
RUN chown -R 1000:1000 /opt/live-status-gateway
1515
USER 1000
16-
CMD ["node", "dist/index.js"]
16+
ENTRYPOINT ["node", "dist/index.js"]

packages/mos-gateway/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN corepack enable
99
RUN yarn install --immutable
1010
RUN yarn run pinst --disable
1111
RUN yarn lerna run --scope \*\*/mos-gateway --include-dependencies --stream build
12-
RUN yarn plugin import workspace-tools
1312
RUN yarn workspaces focus mos-gateway --production # purge dev-dependencies
1413

1514
# DEPLOY IMAGE
@@ -25,4 +24,4 @@ COPY --from=0 /opt/shared-lib /opt/shared-lib
2524
WORKDIR /opt/mos-gateway
2625
RUN chown -R 1000:1000 /opt/mos-gateway
2726
USER 1000
28-
CMD ["node", "dist/index.js"]
27+
ENTRYPOINT ["node", "dist/index.js"]

packages/mos-gateway/Dockerfile.circle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ COPY shared-lib /opt/shared-lib
1010
WORKDIR /opt/mos-gateway
1111
RUN chown -R 1000:1000 /opt/mos-gateway
1212
USER 1000
13-
CMD ["node", "dist/index.js"]
13+
ENTRYPOINT ["node", "dist/index.js"]

packages/playout-gateway/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN corepack enable
99
RUN yarn install --immutable
1010
RUN yarn run pinst --disable
1111
RUN yarn lerna run --scope \*\*/playout-gateway --include-dependencies --stream build
12-
RUN yarn plugin import workspace-tools
1312
RUN yarn workspaces focus playout-gateway --production # purge dev-dependencies
1413

1514
# DEPLOY IMAGE
@@ -25,4 +24,4 @@ COPY --from=0 /opt/shared-lib /opt/shared-lib
2524
WORKDIR /opt/playout-gateway
2625
RUN chown -R 1000:1000 /opt/playout-gateway
2726
USER 1000
28-
CMD ["node", "dist/index.js"]
27+
ENTRYPOINT ["node", "dist/index.js"]

packages/playout-gateway/Dockerfile.circle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ COPY shared-lib /opt/shared-lib
1010
WORKDIR /opt/playout-gateway
1111
RUN chown -R 1000:1000 /opt/playout-gateway
1212
USER 1000
13-
CMD ["node", "dist/index.js"]
13+
ENTRYPOINT ["node", "dist/index.js"]

0 commit comments

Comments
 (0)