adalal/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-08-16 20:32:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

minor refactoring of building process

Browse Source
This commit is contained in:
Julien Neuhart
2019-10-01 17:32:15 +02:00
parent 04b1fa378d
commit a3f05c1146
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -5,7 +5,7 @@ DOCKER_PASSWORD=
DOCKER_REPOSITORY=thecodingmachine DOCKER_REPOSITORY=thecodingmachine
GOLANGCI_LINT_VERSION=1.19.1 GOLANGCI_LINT_VERSION=1.19.1
CODE_COVERAGE=0 CODE_COVERAGE=0
TINI_VERSION=v0.18.0 TINI_VERSION=0.18.0
MAXIMUM_WAIT_TIMEOUT=30.0 MAXIMUM_WAIT_TIMEOUT=30.0
MAXIMUM_WAIT_DELAY=10.0 MAXIMUM_WAIT_DELAY=10.0
MAXIMUM_WEBHOOK_URL_TIMEOUT=30.0 MAXIMUM_WEBHOOK_URL_TIMEOUT=30.0

5
build/base/Dockerfile
View File

@@ -9,7 +9,7 @@ FROM debian:buster-slim
RUN echo "deb http://httpredir.debian.org/debian/ buster main contrib non-free" > /etc/apt/sources.list &&\ RUN echo "deb http://httpredir.debian.org/debian/ buster main contrib non-free" > /etc/apt/sources.list &&\
apt-get update &&\ apt-get update &&\
apt-get install -y curl wget gnupg ttf-mscorefonts-installer apt-get install -y curl wget gnupg ttf-mscorefonts-installer procps
# |-------------------------------------------------------------------------- # |--------------------------------------------------------------------------
# | Chrome # | Chrome
@@ -108,6 +108,3 @@ RUN groupadd --gid 1001 gotenberg \
&& useradd --uid 1001 --gid gotenberg --shell /bin/bash --home /gotenberg --no-create-home gotenberg \ && useradd --uid 1001 --gid gotenberg --shell /bin/bash --home /gotenberg --no-create-home gotenberg \
&& mkdir /gotenberg \ && mkdir /gotenberg \
&& chown gotenberg: /gotenberg && chown gotenberg: /gotenberg
# TODO remove.
RUN apt-get install -y procps

4
build/package/Dockerfile
View File

@@ -42,9 +42,9 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>"
ARG TINI_VERSION ARG TINI_VERSION
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tini
RUN chmod +x /tini RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"] ENTRYPOINT [ "/tini", "--" ]
# |-------------------------------------------------------------------------- # |--------------------------------------------------------------------------
# | Final touch # | Final touch