File tree Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Original file line number Diff line number Diff line change 1- FROM hackmdio/buildpack:1.0.4 as BUILD
1+ FROM hackmdio/buildpack:node-10-0baafb79 as BUILD
22
33COPY --chown=hackmd:hackmd . .
44
@@ -12,11 +12,14 @@ RUN set -xe && \
1212 rm -rf .git .gitignore .travis.yml .dockerignore .editorconfig .babelrc .mailmap .sequelizerc.example \
1313 test docs contribute \
1414 package-lock.json webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \
15- config.json.example README.md CONTRIBUTING.md AUTHORS
15+ config.json.example README.md CONTRIBUTING.md AUTHORS node_modules
1616
17- FROM hackmdio/runtime:1.0.6
17+ ARG RUNTIME=hackmdio/runtime:node-10-0baafb79
18+
19+ FROM hackmdio/runtime:node-10-0baafb79
1820USER hackmd
1921WORKDIR /home/hackmd/app
2022COPY --chown=1500:1500 --from=BUILD /home/hackmd/app .
23+ RUN npm install --production && npm cache clean --force && rm -rf /tmp/{core-js-banners,phantomjs}
2124EXPOSE 3000
2225ENTRYPOINT ["/home/hackmd/app/docker-entrypoint.sh" ]
Original file line number Diff line number Diff line change 22
33CURRENT_DIR=$( dirname " $BASH_SOURCE " )
44
5- docker build -t hackmdio/codimd -f " $CURRENT_DIR /Dockerfile" " $CURRENT_DIR /.."
5+ GIT_SHA1=" $( git rev-parse HEAD) "
6+ GIT_SHORT_ID=" ${SHA1: 0: 8} "
7+ GIT_TAG=$( git describe --exact-match --tags $( git log -n1 --pretty=' %h' ) )
8+
9+ DOCKER_TAG=" ${GIT_TAG:- $GIT_SHORT_ID } "
10+
11+ docker build -t " hackmdio/codimd:$DOCKER_TAG " -f " $CURRENT_DIR /Dockerfile" " $CURRENT_DIR /.."
12+
13+ docker build --build-arg RUNTIME=node-10-cjk-0baafb79 -t " hackmdio/codimd:$DOCKER_TAG -cjk" -f " $CURRENT_DIR /Dockerfile" " $CURRENT_DIR /.."
You can’t perform that action at this time.
0 commit comments