Skip to content

Commit c11f0fa

Browse files
author
admin
committed
fixed sizing of documents
1 parent d4ab04a commit c11f0fa

4 files changed

Lines changed: 14 additions & 12 deletions

File tree

.github/workflows/push-image.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ case $GIT_REF in
2929
DOCKERTAG="${GIT_REF/refs\/heads\//}" ;;
3030
refs/tags/v?(+([0-9]).)+([0-9]).*([0-9]) )
3131
DOCKERTAG="${GIT_REF/refs\/tags\/v/}" ;;
32+
refs/tags/v?(+([0-9]).)+([0-9]).*([0-9])-snapshot )
33+
DOCKERTAG='snapshot' ;;
3234
* )
3335
DOCKERTAG='none' ;;
3436
esac

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ FROM adoptopenjdk/openjdk8:ubi-jre
33
MAINTAINER martin.etmajer@boehringer-ingelheim.com
44

55
WORKDIR /app
6-
COPY app.jar ./app.jar
7-
COPY entrypoint.sh ./entrypoint.sh
6+
COPY build/libs/*all.jar ./app.jar
7+
COPY docker/entrypoint.sh ./entrypoint.sh
88

99
RUN yum update -y && \
1010
yum install -y libX11 libXext libXrender libjpeg xz xorg-x11-fonts-Type1 git-core
1111

1212
# Install wkhtmltopdf
13-
COPY yum.repos.d/centos8.repo /etc/yum.repos.d/centos8.repo
13+
COPY docker/yum.repos.d/centos8.repo /etc/yum.repos.d/centos8.repo
1414
RUN yum install -y xorg-x11-fonts-75dpi && \
1515
curl -kLO https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos8.x86_64.rpm && \
1616
rpm -Uvh wkhtmltox-0.12.5-1.centos8.x86_64.rpm && chmod +x entrypoint.sh

docker/yum.repos.d/centos8.repo

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
[centos-baseos]
2-
name=CentOS-8-BaseOS
3-
baseurl=http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/
1+
[almalinux-baseos]
2+
name=AlmaLinux-8-BaseOS
3+
baseurl=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/
44
enabled=1
55
gpgcheck=1
6-
gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official
6+
gpgkey=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/RPM-GPG-KEY-AlmaLinux
77

8-
[centos-appstream]
9-
name=CentOS-8-AppStream
10-
baseurl=http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/
8+
[almalinux-appstream]
9+
name=AlmaLinux-8-AppStream
10+
baseurl=https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/
1111
enabled=1
1212
gpgcheck=1
13-
gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official
13+
gpgkey=https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/RPM-GPG-KEY-AlmaLinux

src/main/groovy/app/DocGen.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class DocGen implements Jooby.Module {
141141

142142
// Convert a HTML document, with an optional header and footer, into a PDF
143143
static Path convertHtmlToPDF(Path documentHtmlFile, Object data) {
144-
def cmd = ["wkhtmltopdf", "--encoding", "UTF-8", "--no-outline", "--print-media-type"]
144+
def cmd = ["wkhtmltopdf", "--encoding", "UTF-8", "--no-outline", "--print-media-type", "--disable-smart-shrinking"]
145145
cmd << "--enable-local-file-access"
146146
cmd.addAll(["-T", "40", "-R", "25", "-B", "25", "-L", "25"])
147147

0 commit comments

Comments
 (0)