hippoz/waffle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix docker upload directory permissions

Browse source
This commit is contained in:
hippoz 2023-08-08 22:30:39 +03:00
parent b3a93a0011
commit a5803cba6e
Signed by: hippoz
GPG key ID: 56C4E02A85F2FBED
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -25,4 +25,7 @@ COPY --from=strip-dev-deps /app ./
COPY --from=frontend-compiler /app/frontend/public ./frontend/public COPY --from=frontend-compiler /app/frontend/public ./frontend/public
RUN echo "JWT_SECRET=$(openssl rand -base64 256 | tr -d '\n')" > .env RUN echo "JWT_SECRET=$(openssl rand -base64 256 | tr -d '\n')" > .env
USER node USER node
USER root
RUN mkdir /var/lib/waffle/uploads && chown -R node /var/lib/waffle/uploads
USER node
CMD [ "/bin/sh", "-c", "node index.js" ] CMD [ "/bin/sh", "-c", "node index.js" ]

6
docker-compose.yml
View file

@ -11,7 +11,7 @@ services:
waffle: waffle:
build: . build: .
volumes: volumes:
- ./tmp/uploads:/var/lib/waffle/uploads - ./tmp/uploads:/var/lib/waffle
ports: ports:
- "5002:3000" - "5002:3000"
environment: environment:
@ -19,7 +19,7 @@ services:
- PGHOST=waffle-postgres - PGHOST=waffle-postgres
- PGPASSWORD=supersecretpassword11 - PGPASSWORD=supersecretpassword11
- PGDATABASE=waffle - PGDATABASE=waffle
- AVATAR_UPLOADS_DIR=/var/lib/waffle/uploads - AVATAR_UPLOADS_DIR=/var/lib/waffle/uploads/avatar
- ATTACHMENT_UPLOADS_DIR=/var/lib/waffle/uploads - ATTACHMENT_UPLOADS_DIR=/var/lib/waffle/uploads/attachment
depends_on: depends_on:
- waffle-postgres - waffle-postgres

2
src/gateway/index.ts
View file

@ -232,7 +232,7 @@ export class GatewayClient {
} }
getPresenceEntry(status: GatewayPresenceStatus): GatewayPresenceEntry | null { getPresenceEntry(status: GatewayPresenceStatus): GatewayPresenceEntry | null {
if (!this.user || !this.ready) { if (!this.user) {
return null; return null;
} }