Merge pull request #76 from opendevstack/bugfix/fixes-broken-dockerfile-x11-fonts-installation-port-4x

Bugfix/fixes broken dockerfile x11 fonts installation port 4x

Author: stitakis

CHANGELOG.md

@@ -1,7 +1,12 @@
 # Changelog
 
 ## Unreleased
+
+### Added
 - Improve memory management and error handling ([#70](https://github.com/opendevstack/ods-document-generation-svc/pull/70))
+ 
+### Fixed
+- ODS AMI build failing due to broken x11 fonts package installation ([#74](https://github.com/opendevstack/ods-document-generation-svc/pull/74))
 
 ## [4.0] - 2021-18-11
 

docker/Dockerfile

@@ -6,11 +6,12 @@ WORKDIR /app
 COPY app.jar ./app.jar
 COPY entrypoint.sh ./entrypoint.sh
 
-# Install wkhtmltopdf
 RUN yum update -y && \
-    yum install -y libX11 libXext libXrender libjpeg xz xorg-x11-fonts-Type1 git-core && \
-    curl -kLO http://mirror.centos.org/centos/8/AppStream/aarch64/os/Packages/xorg-x11-fonts-75dpi-7.5-19.el8.noarch.rpm && \
-    rpm -Uvh xorg-x11-fonts-75dpi-7.5-19.el8.noarch.rpm && \
+    yum install -y libX11 libXext libXrender libjpeg xz xorg-x11-fonts-Type1 git-core
+
+# Install wkhtmltopdf
+COPY yum.repos.d/centos8.repo /etc/yum.repos.d/centos8.repo
+RUN yum install -y xorg-x11-fonts-75dpi && \
     curl -kLO https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos8.x86_64.rpm && \
     rpm -Uvh wkhtmltox-0.12.5-1.centos8.x86_64.rpm && chmod +x entrypoint.sh
 

docker/yum.repos.d/centos8.repo

@@ -0,0 +1,13 @@
+[centos-baseos]
+name=CentOS-8-BaseOS
+baseurl=http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official
+
+[centos-appstream]
+name=CentOS-8-AppStream
+baseurl=http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official