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

using (again) Golang binaries from official Docker image instead of standard install without checkum + added a TODO for healtheck

Browse Source
This commit is contained in:
Julien Neuhart
2019-07-23 14:25:31 +02:00
parent 7bfbda4490
commit 0d827e490e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,4 +1,4 @@
GOLANG_VERSION=1.12.7 GOLANG_VERSION=1.12
VERSION=snapshot VERSION=snapshot
DOCKER_USER= DOCKER_USER=
DOCKER_PASSWORD= DOCKER_PASSWORD=

10
build/workspace/Dockerfile
View File

@@ -1,7 +1,9 @@
FROM thecodingmachine/gotenberg:base
ARG GOLANG_VERSION ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}-stretch as golang
FROM thecodingmachine/gotenberg:base
# |-------------------------------------------------------------------------- # |--------------------------------------------------------------------------
# | Common libraries # | Common libraries
# |-------------------------------------------------------------------------- # |--------------------------------------------------------------------------
@@ -25,9 +27,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# | Installs Golang. # | Installs Golang.
# | # |
RUN wget https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz &&\ COPY --from=golang /usr/local/go /usr/local/go
tar -xvf go${GOLANG_VERSION}.linux-amd64.tar.gz &&\
mv go /usr/local
ENV GOPATH /gotenberg/go ENV GOPATH /gotenberg/go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

1
internal/app/xhttp/handler.go
View File

@@ -31,6 +31,7 @@ func pingHandler(c echo.Context) error {
if err := ctx.ProcessesHealthcheck(); err != nil { if err := ctx.ProcessesHealthcheck(); err != nil {
return xerror.New(op, err) return xerror.New(op, err)
} }
// TODO return processes info
return nil return nil
} }