Merge pull request #1 from propstack/feat/libreoffice-6

Feat/libreoffice 6

Author: christianwesthoff

.gitignore

@@ -1,7 +1,3 @@
-.idea/
-.terraform/
-*.tfstate.lock.info
-*.tfstate.backup
-*.backup
-lo.tar.gz
-layers.zip
+# build output
+layer
+layer.zip

Dockerfile

@@ -1,10 +1,10 @@
-FROM amazonlinux:2.0.20190508 as lobuild
+FROM public.ecr.aws/lambda/nodejs:14.2022.02.01.09-x86_64 as lobuild
 
 # see https://stackoverflow.com/questions/2499794/how-to-fix-a-locale-setting-warning-from-perl
 ENV LC_CTYPE=en_US.UTF-8
 ENV LC_ALL=en_US.UTF-8
 
-ENV LIBREOFFICE_VERSION=6.2.1.2
+ENV LIBREOFFICE_VERSION=6.4.7.2
 
 # install basic stuff required for compilation
 RUN yum install -y yum-utils \
@@ -53,16 +53,27 @@ RUN cd /tmp \
     && curl -L https://github.com/LibreOffice/core/archive/libreoffice-${LIBREOFFICE_VERSION}.tar.gz | tar -xz \
     && mv core-libreoffice-${LIBREOFFICE_VERSION} libreoffice
 
+# install required gperf 3.1
+RUN cd /tmp \
+    && curl -L http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz | tar -xz \
+    && cd gperf-3.1 \
+    && ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-3.1 && make && make -j1 check && make install && gperf --version
+
+# install required flex 2.6.4
+RUN cd /tmp \
+    && curl -L https://github.com/westes/flex/files/981163/flex-2.6.4.tar.gz | tar -xz \
+    && cd flex-2.6.4 \
+    && ./autogen.sh && ./configure && make && make install && flex --version
+
+
+# install liblangtag
+RUN yum repolist && yum install -y liblangtag && cp -r /usr/share/liblangtag /usr/local/share/liblangtag/
+
 WORKDIR /tmp/libreoffice
 
 # see https://ask.libreoffice.org/en/question/72766/sourcesver-missing-while-compiling-from-source/
 RUN echo "lo_sources_ver=${LIBREOFFICE_VERSION}" >> sources.ver
 
-# install liblangtag (not available in Amazon Linux or EPEL repos)
-# paste repo info from https://unix.stackexchange.com/questions/433046/how-do-i-enable-centos-repositories-on-rhel-red-hat
-COPY config/centos.repo /etc/yum.repos.d/
-RUN yum repolist && yum install -y liblangtag && cp -r /usr/share/liblangtag /usr/local/share/liblangtag/
-
 RUN ./autogen.sh \
     --disable-avahi \
     --disable-cairo-canvas \
@@ -78,12 +89,9 @@ RUN ./autogen.sh \
     --disable-extension-update \
     --disable-firebird-sdbc \
     --disable-gio \
-    --disable-gstreamer-0-10 \
     --disable-gstreamer-1-0 \
-    --disable-gtk \
     --disable-gtk3 \
     --disable-introspection \
-    --disable-kde4 \
     --disable-largefile \
     --disable-lotuswordpro \
     --disable-lpsolve \
@@ -100,11 +108,6 @@ RUN ./autogen.sh \
     --disable-sdremote-bluetooth \
     --enable-mergelibs \
     --with-galleries="no" \
-    --with-system-curl \
-    --with-system-expat \
-    --with-system-libxml \
-    --with-system-nss \
-    --with-system-openssl \
     --with-theme="no" \
     --without-export-validation \
     --without-fonts \
@@ -135,16 +138,34 @@ RUN rm -rf ./instdir/share/gallery \
     ./instdir/LICENSE* \
     ./instdir/NOTICE
 
+# install required tooling for shared object handling
+RUN yum install -y rpmdevtools
+WORKDIR /tmp/rpms
+
+# add shared objects that are missing in the aws lambda docker container
+RUN yumdownloader libX11.x86_64 libxcb.x86_64 libXau.x86_64 libxslt.x86_64 fontconfig.x86_64 freetype.x86_64 \
+    libXext.x86_64 libSM.x86_64 libICE.x86_64 libXrender.x86_64 libpng.x86_64
+
+# add shared object that are missing the aws lambda runtime
+RUN yumdownloader libxml2.x86_64 expat.x86_64 libuuid.x86_64 xz-libs.x86_64 bzip2-libs.x86_64
+
+# extract and add shared objects to program folder
+RUN rpmdev-extract *.rpm
+WORKDIR /tmp
+RUN mv ./rpms/*/usr/lib64/* ./libreoffice/instdir/program
+
+WORKDIR /tmp/libreoffice
+
 # test if compilation was successful
 RUN echo "hello world" > a.txt \
     && ./instdir/program/soffice --headless --invisible --nodefault --nofirststartwizard \
         --nolockcheck --nologo --norestore --convert-to pdf --outdir $(pwd) a.txt
 
 RUN tar -cvf /tmp/lo.tar instdir/
 
-FROM amazonlinux:2.0.20190508 as brotli
+FROM public.ecr.aws/lambda/nodejs:14.2022.02.01.09-x86_64 as brotli
 
-ENV BROTLI_VERSION=1.0.7
+ENV BROTLI_VERSION=1.0.9
 
 WORKDIR /tmp
 
@@ -160,8 +181,11 @@ RUN yum install -y make zip unzip bc autoconf automake libtool \
 
 COPY --from=lobuild /tmp/lo.tar .
 
-RUN brotli --best /tmp/lo.tar && zip -r layers.zip lo.tar.br
+RUN brotli --best /tmp/lo.tar && zip -r layer.zip lo.tar.br
+
+FROM public.ecr.aws/lambda/nodejs:14.2022.02.01.09-x86_64
 
-FROM amazonlinux:2.0.20190508
+COPY --from=brotli /tmp/layer.zip /tmp
 
-COPY --from=brotli /tmp/layers.zip /tmp
+# overwrite entrypoint as aws base image tries to run a handler function
+ENTRYPOINT []