From e0300302e527df3668f02c5624818a0c9d926fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 12 Feb 2020 02:02:49 +0100
Subject: [PATCH] Formatting
---
debian/Dockerfile | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/debian/Dockerfile b/debian/Dockerfile
index c870efa..21243b6 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -6,8 +6,8 @@ ARG VERSION=master
ARG UID=10000
# Set some default config variables
-ENV DEBIAN_FRONTEND noninteractive
-ENV DOCKERIZE_VERSION v0.6.1
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DOCKERIZE_VERSION=v0.6.1
ENV NODE_ENV=production
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
@@ -35,9 +35,12 @@ RUN set -ex; \
COPY resources/config.json resources/.sequelizerc /files/
RUN apt-get update && \
- apt-get install -y git build-essential jq && \
- # Add fonts for PDF export
- apt-get install -y fonts-noto && \
+ apt-get install -y \
+ build-essential \
+ git \
+ jq \
+ # Add fonts for PDF export
+ fonts-noto && \
# Clone the source
git clone --depth 1 --branch "$VERSION" "$CODIMD_REPOSITORY" /codimd && \
@@ -54,8 +57,10 @@ RUN apt-get update && \
mv /codimd/package.new.json /codimd/package.json && \
# Symlink configuration files
- rm -f /codimd/config.json && ln -s /files/config.json /codimd/config.json && \
- rm -f /codimd/.sequelizerc && ln -s /files/.sequelizerc /codimd/.sequelizerc && \
+ rm -f /codimd/config.json && \
+ ln -s /files/config.json /codimd/config.json && \
+ rm -f /codimd/.sequelizerc && \
+ ln -s /files/.sequelizerc /codimd/.sequelizerc && \
# Install NPM dependencies and build project
yarn install --pure-lockfile && \
@@ -66,7 +71,8 @@ RUN apt-get update && \
yarn install && \
yarn cache clean && \
apt-get remove -y --auto-remove build-essential git jq && \
- apt-get purge && rm -r /var/lib/apt/lists/* && \
+ apt-get purge && \
+ rm -r /var/lib/apt/lists/* && \
# Create codimd user
adduser --uid $UID --home /codimd/ --disabled-password --system codimd && \
chown -R codimd /codimd/
@@ -74,7 +80,7 @@ RUN apt-get update && \
WORKDIR /codimd
EXPOSE 3000
-COPY resources/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY ["resources/docker-entrypoint.sh", "/usr/local/bin/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
--
GitLab