Get docker running properly and add more logging

This commit is contained in:
Tom Wright
2020-04-15 19:26:21 +01:00
parent 06b5694125
commit 1bdfc9e612
7 changed files with 126 additions and 54 deletions

View File

@@ -1,19 +1,8 @@
# This stage builds the mermaidcli executable.
FROM node:12.12.0-buster as node
WORKDIR /root
# copy the mermaidcli node package into the container and install
COPY ./mermaidcli/* .
RUN npm install
# This stage builds the go executable.
FROM golang:1.13-buster as go
WORKDIR /root
COPY . .
COPY ./ ./
RUN go build -o bin/app cmd/app/main.go
@@ -21,14 +10,66 @@ RUN go build -o bin/app cmd/app/main.go
# Final stage that will be pushed.
FROM debian:buster-slim
FROM node:12.12.0-buster-slim as node
WORKDIR /root
# copy the mermaidcli node package into the container and install
COPY ./mermaidcli/* ./
RUN npm install
ENV DEBIAN_FRONTEND=noninteractive
RUN apt update 2>/dev/null && \
apt install -y --no-install-recommends \
ca-certificates \
gconf-service \
libasound2 \
libatk1.0-0 \
libatk-bridge2.0-0 \
libc6 \
libcairo2 \
libcups2 \
libdbus-1-3 \
libexpat1 \
libfontconfig1 \
libgcc1 \
libgconf-2-4 \
libgdk-pixbuf2.0-0 \
libglib2.0-0 \
libgtk-3-0 \
libnspr4 \
libpango-1.0-0 \
libpangocairo-1.0-0 \
libstdc++6 \
libx11-6 \
libx11-xcb1 \
libxcb1 \
libxcomposite1 \
libxcursor1 \
libxdamage1 \
libxext6 \
libxfixes3 \
libxi6 \
libxrandr2 \
libxrender1 \
libxss1 \
libxtst6 \
ca-certificates \
fonts-liberation \
libappindicator1 \
libnss3 \
lsb-release \
xdg-utils \
wget \
2>/dev/null
COPY --from=node /root/node_modules/.bin/mmdc ./mermaidcli
COPY --from=go /root/bin/app ./app
# We should now have all the required dependencies to build the proto files.
CMD ["./app", "--mermaid=./mermaidcli"]
RUN mkdir -p ./in
RUN mkdir -p ./out
RUN chmod 0777 ./in
RUN chmod 0777 ./out
CMD ["./app", "--mermaid=./node_modules/.bin/mmdc", "--in=./in", "--out=./out", "--puppeteer=./puppeteer-config.json"]