Skip to content

Commit b9df9ef

Browse files
committed
Fix Docker build
1 parent dd0c980 commit b9df9ef

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@
99
LICENSE.txt
1010
Dockerfile
1111
packages/client/dist
12-
packages/server/dist
1312
newsdash-dist.zip

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ COPY . .
66
RUN set -xe && \
77
apk add --update --no-cache \
88
build-base \
9+
git \
910
python3 && \
1011
yarn install \
1112
--non-interactive \
@@ -17,7 +18,7 @@ WORKDIR /newsdash
1718
COPY --from=build /newsdash/package.json .
1819
COPY --from=build /newsdash/packages/client/dist ./packages/client/dist
1920
COPY --from=build /newsdash/packages/server/package.json ./packages/server/
20-
COPY --from=build /newsdash/packages/server/dist ./packages/server/dist
21+
COPY --from=build /newsdash/packages/server/src ./packages/server/src
2122
RUN set -xe && \
2223
addgroup -S newsdash && \
2324
adduser -S -g newsdash newsdash && \
@@ -37,4 +38,4 @@ ENV REDIS_URL redis://redis:6379
3738
EXPOSE 3001
3839
VOLUME /newsdash/client
3940

40-
CMD ["/bin/sh", "-c", "cp -R packages/client/dist/* client/ && su - newsdash -s /bin/sh -c \"NODE_ENV=production REDIS_URL=${REDIS_URL} /newsdash/packages/server/node_modules/.bin/pm2-runtime start --name newsdash -- /newsdash/packages/server/dist/server.js\""]
41+
CMD ["/bin/sh", "-c", "cp -R packages/client/dist/* client/ && su - newsdash -s /bin/sh -c \"NODE_ENV=production REDIS_URL=${REDIS_URL} /newsdash/packages/server/node_modules/.bin/pm2-runtime start --name newsdash -- /newsdash/packages/server/src/index.js\""]

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,18 @@
2323
"url": "https://github.com/buzz/newsdash.git"
2424
},
2525
"scripts": {
26-
"build": "yarn client:build && yarn server:build",
26+
"build": "yarn client:build",
2727
"client:build:bundle-analyze": "BUNDLE_ANALYZE=1 yarn build",
2828
"client:build": "yarn workspace @newsdash/client build",
2929
"client:dev": "yarn workspace @newsdash/client dev",
3030
"format": "prettier --write \"*.js\" \"packages/**/*.js\"",
3131
"lint": "eslint .",
32-
"server:build": "yarn workspace @newsdash/server build",
3332
"server:dev": "yarn workspace @newsdash/server dev",
3433
"server:start": "yarn workspace @newsdash/server start",
3534
"start": "yarn server:start"
3635
},
3736
"eslintIgnore": [
38-
"/packages/client/dist",
39-
"/packages/server/dist"
37+
"/packages/client/dist"
4038
],
4139
"dependencies": {},
4240
"devDependencies": {

0 commit comments

Comments
 (0)