Docker changes
This commit is contained in:
parent
78b48c40c2
commit
853850f8af
|
@ -1,12 +1,9 @@
|
||||||
FROM node:18
|
FROM node:18
|
||||||
ARG UID=911
|
|
||||||
ARG GID=911
|
|
||||||
|
|
||||||
WORKDIR /usr/share/dach
|
WORKDIR /usr/share/dach
|
||||||
COPY package*.json ./
|
COPY package*.json ./
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
RUN npm install
|
RUN npm install
|
||||||
USER dach
|
|
||||||
EXPOSE 1337
|
EXPOSE 1337
|
||||||
ENTRYPOINT ["docker-entrypoint.sh"]
|
ENTRYPOINT ["./docker-entrypoint.sh"]
|
||||||
|
|
|
@ -5,8 +5,8 @@ services:
|
||||||
image: postgres:12.1-alpine
|
image: postgres:12.1-alpine
|
||||||
container_name: dach_db
|
container_name: dach_db
|
||||||
restart: always
|
restart: always
|
||||||
# healthcheck:
|
healthcheck:
|
||||||
# test: ["CMD", "pg_isready", "-U", "dach"]
|
test: ["CMD", "pg_isready", "-U", "dach"]
|
||||||
env_file:
|
env_file:
|
||||||
- ./db.env
|
- ./db.env
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -23,18 +23,12 @@ services:
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- '1337:1337'
|
- '1337:1337'
|
||||||
|
- '1488:1488'
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
|
|
||||||
# Feel free to remove or override this section
|
|
||||||
# See 'Build-time variables' in README.md
|
|
||||||
args:
|
|
||||||
- "UID=911"
|
|
||||||
- "GID=911"
|
|
||||||
# volumes:
|
|
||||||
# - ./uploads:/var/lib/pleroma/uploads
|
|
||||||
env_file:
|
env_file:
|
||||||
- ./web.env
|
- ./web.env
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
db:
|
||||||
|
condition: service_started
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
npm start
|
npm start
|
||||||
|
|
Loading…
Reference in New Issue