status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1357 from hackmdio/fix/pcheck-related-issues 

fix pcheck not parsed url correctly
This commit is contained in:
Max Wu 2019-11-29 15:09:45 +08:00 committed by GitHub
parent 5002ec4b4e f1594c56e2
commit 76f4c001d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployments/Dockerfile
View File

@ -15,7 +15,7 @@ RUN set -xe && \
yarn.lock webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \ yarn.lock webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \
config.json.example README.md CONTRIBUTING.md AUTHORS config.json.example README.md CONTRIBUTING.md AUTHORS
FROM hackmdio/runtime:1.0.4 FROM hackmdio/runtime:1.0.6
USER hackmd USER hackmd
WORKDIR /home/hackmd/app WORKDIR /home/hackmd/app
COPY --chown=1500:1500 --from=BUILD /home/hackmd/app . COPY --chown=1500:1500 --from=BUILD /home/hackmd/app .

2
deployments/docker-compose.yml
View File

@ -10,6 +10,8 @@ services:
- "database-data:/var/lib/postgresql/data" - "database-data:/var/lib/postgresql/data"
restart: always restart: always
codimd: codimd:
# you can use image or custom build below
# image: nabo.codimd.dev/hackmdio/hackmd:1.4.0
build: build:
context: .. context: ..
dockerfile: ./deployments/Dockerfile dockerfile: ./deployments/Dockerfile

2
deployments/docker-entrypoint.sh
View File

@ -8,7 +8,7 @@ if [[ "$#" -gt 0 ]]; then
fi fi
# check database and redis is ready # check database and redis is ready
pcheck -constr "$CMD_DB_URL" pcheck -env CMD_DB_URL
# run DB migrate # run DB migrate
NEED_MIGRATE=${CMD_AUTO_MIGRATE:=true} NEED_MIGRATE=${CMD_AUTO_MIGRATE:=true}