harmacist/darkwire.io
1
0
Fork 0
mirror of https://github.com/darkwire/darkwire.io.git synced 2025-09-01 17:10:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix build command

Browse Source
This commit is contained in:
Jeremie Pardou-Piquemal 2022-12-29 14:28:43 +01:00 committed by Jérémie Pardou-Piquemal
parent 448dc80884
commit 27c0214c5e
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:14.7.0-stretch FROM node:18-alpine3.17
# Installing yarn # Installing yarn
RUN apt update -y && \ RUN apt update -y && \
@ -11,20 +11,18 @@ ENV MAILGUN_API_KEY=api-key \
MAILGUN_DOMAIN=darkwire.io \ MAILGUN_DOMAIN=darkwire.io \
ABUSE_TO_EMAIL_ADDRESS=abuse@darkwire.io \ ABUSE_TO_EMAIL_ADDRESS=abuse@darkwire.io \
ABUSE_FROM_EMAIL_ADDRESS="Darkwire <no-reply@darkwire.io>" \ ABUSE_FROM_EMAIL_ADDRESS="Darkwire <no-reply@darkwire.io>" \
CLIENT_DIST_DIRECTORY='client/dist/path'\ CLIENT_DIST_DIRECTORY='client/dist/'\
ROOM_HASH_SECRET='some-uuid'\ ROOM_HASH_SECRET='some-uuid'\
SITE_URL=https://darkwire.io \ SITE_URL=https://darkwire.io \
STORE_BACKEND=redis \ STORE_BACKEND=memory
STORE_HOST=redis://redis:6379
# Client configuration will be put into client/.env # Client configuration will be put into client/.env
ENV TZ=UTC \ ENV TZ=UTC \
REACT_APP_API_HOST=localhost \ VITE_API_HOST=localhost \
REACT_APP_API_PROTOCOL=http \ VITE_API_PROTOCOL=http \
REACT_APP_API_PORT=3001 \ VITE_API_PORT=3001 \
REACT_APP_COMMIT_SHA=some_sha \ VITE_COMMIT_SHA=some_sha \
REACT_APP_COMMIT_SHA=some_sha \ VITE_MAX_FILE_SIZE=4
REACT_APP_MAX_FILE_SIZE=4
COPY --chown=node:node . . COPY --chown=node:node . .
@ -33,7 +31,7 @@ RUN yarn build
STOPSIGNAL SIGINT STOPSIGNAL SIGINT
EXPOSE 3001 EXPOSE 3001
HEALTHCHECK --interval=30s --timeout=30s --start-period=10s --retries=3 \ HEALTHCHECK --interval=30s --timeout=30s --start-period=10s --retries=3 \
CMD [ "curl", "-f", "${REACT_APP_API_PROTOCOL}://localhost:${REACT_APP_API_PORT}", "||", "exit", "1" ] CMD [ "curl", "-f", "${VITE_API_PROTOCOL}://localhost:${VITE_API_PORT}", "||", "exit", "1" ]
ENTRYPOINT [ "docker-entrypoint.sh" ] ENTRYPOINT [ "docker-entrypoint.sh" ]
CMD ["yarn", "start"] CMD ["yarn", "start"]

5
client/tsconfig.json
View File

@ -14,7 +14,10 @@
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
"noEmit": true, "noEmit": true,
"jsx": "react-jsx" "jsx": "react-jsx",
"paths": {
"@/*": ["./src/*"]
}
}, },
"include": ["src"], "include": ["src"],
"references": [{ "path": "./tsconfig.node.json" }] "references": [{ "path": "./tsconfig.node.json" }]

2
package.json
View File

@ -18,7 +18,7 @@
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"build": "./build.sh", "build": "./build.sh",
"start": "cd server && CLIENT_DIST_DIRECTORY='../client/build' yarn start", "start": "cd server && CLIENT_DIST_DIRECTORY='../client/dist' yarn start",
"setup": "yarn && cd client && yarn && cd ../server && yarn", "setup": "yarn && cd client && yarn && cd ../server && yarn",
"dev": "concurrently 'cd client && yarn dev' 'cd server && yarn dev'", "dev": "concurrently 'cd client && yarn dev' 'cd server && yarn dev'",
"test": "concurrently 'cd client && yarn coverage' 'cd server && yarn test --watch=false'", "test": "concurrently 'cd client && yarn coverage' 'cd server && yarn test --watch=false'",