From f1594c56e23ddbcb6b5ab5cc9c64d8be0d9ce38c Mon Sep 17 00:00:00 2001 From: BoHong Li Date: Thu, 28 Nov 2019 13:44:02 +0800 Subject: [PATCH] feat: upgrade base image to resolve pcheck issues 1. upgrade node.js version from 8.16.0 to 8.16.2 2. upgrade pcheck to support connection string from environment 3. upgrade pcheck to fix connection string contains underscore might not resolve correctly Signed-off-by: BoHong Li --- deployments/Dockerfile | 2 +- deployments/docker-compose.yml | 2 ++ deployments/docker-entrypoint.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deployments/Dockerfile b/deployments/Dockerfile index 916012a5..11006b09 100644 --- a/deployments/Dockerfile +++ b/deployments/Dockerfile @@ -15,7 +15,7 @@ RUN set -xe && \ yarn.lock webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \ config.json.example README.md CONTRIBUTING.md AUTHORS -FROM hackmdio/runtime:1.0.4 +FROM hackmdio/runtime:1.0.6 USER hackmd WORKDIR /home/hackmd/app COPY --chown=1500:1500 --from=BUILD /home/hackmd/app . diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index 0ec4a658..2897bcda 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -10,6 +10,8 @@ services: - "database-data:/var/lib/postgresql/data" restart: always codimd: + # you can use image or custom build below + # image: nabo.codimd.dev/hackmdio/hackmd:1.4.0 build: context: .. dockerfile: ./deployments/Dockerfile diff --git a/deployments/docker-entrypoint.sh b/deployments/docker-entrypoint.sh index 0ea7f9a4..0016eaf8 100755 --- a/deployments/docker-entrypoint.sh +++ b/deployments/docker-entrypoint.sh @@ -8,7 +8,7 @@ if [[ "$#" -gt 0 ]]; then fi # check database and redis is ready -pcheck -constr "$CMD_DB_URL" +pcheck -env CMD_DB_URL # run DB migrate NEED_MIGRATE=${CMD_AUTO_MIGRATE:=true}