feat: 1.0.3

1. runtime add sequelize package 2. buildpack add hackmd user

Author: a60814billy

buildpack/Dockerfile

@@ -2,7 +2,11 @@ FROM node:8.16.0-jessie
 
 ENV DEBIAN_VERSION_NAME jessie
 
-RUN set -x && \
+ARG USER_NAME=hackmd
+ARG UID=1500
+ARG GID=1500
+
+RUN set -xe && \
  apt-get update && \
  # install postgres client
  apt-get install -y --no-install-recommends apt-transport-https && \
@@ -15,13 +19,24 @@ RUN set -x && \
  npm i -g npm@6.10.3 && \
  # install node-prune
  npm i -g node-prune && npm cache clean --force && \
+ # Add user and groupd
+ groupadd --gid $GID $USER_NAME && \
+ useradd --uid $UID --gid $USER_NAME --no-log-init --create-home $USER_NAME && \
+ mkdir /home/$USER_NAME/.npm && \
+ echo "prefix=/home/$USER_NAME/.npm/" > /home/$USER_NAME/.npmrc && \
  # setup github ssh key
- mkdir -p /root/.ssh && \
- ssh-keyscan -H github.com >> /root/.ssh/known_hosts && \
+ mkdir -p /home/hackmd/.ssh && \
+ ssh-keyscan -H github.com >> /home/hackmd/.ssh/known_hosts && \
  # setup git credential helper
- mkdir -p /root/git && \
- git config --global credential.helper 'store --file /root/git/credentials'
+ mkdir -p /home/hackmd/git && \
+ git config --global credential.helper 'store --file /home/hackmd/git/credentials' && \
+ # setup app dir
+ mkdir -p /home/$USER_NAME/app && \
+ # adjust permission
+ chown -R $USER_NAME:$USER_NAME /home/$USER_NAME
 
+USER hackmd
+ENV PATH="/home/hackmd/.npm/bin:$PATH"
+WORKDIR /home/$USER_NAME/app
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-
 CMD ["node"]

runtime/Dockerfile

@@ -1,12 +1,17 @@
 FROM node:8.16.0-jessie
 
-ENV DEBIAN_VERSION_NAME jessie
+ENV DEBIAN_VERSION_NAME=jessie NODE_ENV=production
 ENV NODE_ENV production
 
 ARG USER_NAME=hackmd
 ARG UID=1500
 ARG GID=1500
 
+ADD fonts/*.otf /usr/share/fonts/opentype/noto/
+ADD fonts/*.ttf /usr/share/fonts/truetype/noto/
+# add font conf for fonts orders
+ADD local.conf /etc/fonts/
+
 RUN set -xe && \
  apt-get update && \
  # install postgres client
@@ -20,31 +25,26 @@ RUN set -xe && \
  wget https://github.com/hackmdio/portchecker/releases/download/v1.0.2/portchecker-linux-amd64.tar.gz && \
  tar xvf portchecker-linux-amd64.tar.gz -C /usr/local/bin && \
  mv /usr/local/bin/portchecker-linux-amd64 /usr/local/bin/pcheck && \
+ rm portchecker-linux-amd64.tar.gz && \
  # Add user and groupd
  groupadd --gid $GID $USER_NAME && \
  useradd --uid $UID --gid $USER_NAME --no-log-init --create-home $USER_NAME && \
- mkdir /home/$USER_NAME/.npm-global && \
- echo "prefix=/home/$USER_NAME/.npm-global/" > /home/$USER_NAME/.npmrc && \
+ mkdir /home/$USER_NAME/.npm && \
+ echo "prefix=/home/$USER_NAME/.npm/" > /home/$USER_NAME/.npmrc && \
  # setup app dir
  mkdir -p /home/$USER_NAME/app && \
  # adjust permission
- chown -R $USER_NAME:$USER_NAME /home/$USER_NAME
-
-ADD fonts/*.otf /usr/share/fonts/opentype/noto/
-ADD fonts/*.ttf /usr/share/fonts/truetype/noto/
-# add font conf for fonts orders
-ADD local.conf /etc/fonts/
-
-RUN fc-cache -f -v && \
+ chown -R $USER_NAME:$USER_NAME /home/$USER_NAME && \
+ su - hackmd -c "npm install -g sequelize-cli@4.1.1 sequelize@4.13.11 npm@6.10.3 && npm cache clean --force" && \
+ fc-cache -f -v && \
  dpkg-reconfigure fontconfig-config && \
  dpkg-reconfigure fontconfig
 
-USER hackmd
-RUN npm install -g sequelize-cli npm@6.10.3
+#RUN npm install -g sequelize-cli@4.1.1 sequelize@4.13.11 npm@6.10.3
 
+USER hackmd
+ENV PATH="/home/hackmd/.npm/bin:$PATH"
 WORKDIR /home/$USER_NAME/app
-
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-
 CMD ["node"]