Merge pull request rpidanny#2 from rpidanny/lib-fix

Fix missing shared libraries

Closes rpidanny#1

Author: rpidanny

.gitignore

@@ -1 +1,2 @@
-*.zip
+*.zip
+layer

Dockerfile

@@ -2,16 +2,37 @@ FROM lambci/lambda-base:build
 
 RUN yum update -y
 
-RUN yum install -y libpng-devel libjpeg-devel libtiff-devel gcc
+RUN yum install -y libpng-devel libjpeg-devel libtiff-devel libuuid-devel gcc
 
 ARG GM_VERSION
 
 RUN curl https://versaweb.dl.sourceforge.net/project/graphicsmagick/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}.tar.xz | tar -xJ && \
   cd GraphicsMagick-${GM_VERSION} && \
-  ./configure --prefix=/opt --enable-shared=no --enable-static=yes && \
+  ./configure --prefix=/opt --enable-shared=no --enable-static=yes --with-gs-font-dir=/opt/share/fonts/default/Type1 && \
   make && \
   make install
 
+RUN cp /usr/lib64/liblcms2.so* /opt/lib && \
+  cp /usr/lib64/libtiff.so* /opt/lib && \
+  cp /usr/lib64/libfreetype.so* /opt/lib && \
+  cp /usr/lib64/libjpeg.so* /opt/lib && \
+  cp /usr/lib64/libpng*.so* /opt/lib && \
+  cp /usr/lib64/libXext.so* /opt/lib && \
+  cp /usr/lib64/libSM.so* /opt/lib && \
+  cp /usr/lib64/libICE.so* /opt/lib && \
+  cp /usr/lib64/libX11.so* /opt/lib && \
+  cp /usr/lib64/liblzma.so* /opt/lib && \
+  cp /usr/lib64/libxml2.so* /opt/lib && \
+  cp /usr/lib64/libgomp.so* /opt/lib && \
+  cp /usr/lib64/libjbig.so* /opt/lib && \
+  cp /usr/lib64/libxcb.so* /opt/lib && \
+  cp /usr/lib64/libXau.so* /opt/lib && \
+  cp /usr/lib64/libuuid.so /opt/lib/libuuid.so.1 && \  
+  cp /usr/lib64/libbz2.so /opt/lib/libbz2.so.1
+
+RUN mkdir -p /opt/share/fonts/default && \
+  cp -R /usr/share/fonts/default/Type1 /opt/share/fonts/default/Type1
+
 RUN cd /opt && \
   find . ! -perm -o=r -exec chmod +400 {} \; && \
   zip -yr /tmp/gm-${GM_VERSION}.zip ./*

README.md

@@ -7,7 +7,7 @@ AWS Lambda layer with GraphicsMagick binaries.
 Click on Layers and choose `Add a layer`, and `Provide a layer version ARN` and enter the following ARN (replace eu-west-1 with the region of your Lambda):
 
 ```
-arn:aws:lambda:eu-west-1:175033217214:layer:graphicsmagick:1
+arn:aws:lambda:eu-west-1:175033217214:layer:graphicsmagick:2
 ```
 
 ![Provide layer ARN](img/usage.png "Provide layer ARN screenshot")
@@ -16,7 +16,7 @@ arn:aws:lambda:eu-west-1:175033217214:layer:graphicsmagick:1
 
 | GraphicsMagick version | ARN |
 | --- | --- |
-| 1.3.31 | `arn:aws:lambda:<region>:175033217214:layer:graphicsmagick:1` |
+| 1.3.31 | `arn:aws:lambda:<region>:175033217214:layer:graphicsmagick:2` |
 
 ## Available Regions
 

test.sh

@@ -0,0 +1,15 @@
+rm -rf layer && unzip layer.zip -d layer
+
+cd test
+
+docker run -i --rm \
+  -v "$PWD":/var/task \
+  -v "$PWD"/../layer:/opt \
+  lambci/lambda:nodejs10.x \
+  index.handler
+
+docker run -i --rm \
+  -v "$PWD":/var/task \
+  -v "$PWD"/../layer:/opt \
+  lambci/lambda:python3.7 \
+  main.handler

test/image1.jpg

@@ -0,0 +1,11 @@
+const { execSync } = require('child_process')
+
+exports.handler = async (event) => {
+  execSync('gm version', { encoding: 'utf8', stdio: 'inherit' })
+
+  execSync('gm convert -list formats', { encoding: 'utf8', stdio: 'inherit' })
+
+  execSync('gm convert -list fonts', { encoding: 'utf8', stdio: 'inherit' })
+
+  execSync('gm convert -font Courier -fill white -draw "rotate 20 text 10,10 Hello-World" image1.jpg /tmp/gm-test-output.jpg', { encoding: 'utf8', stdio: 'inherit' })
+}

test/index.js

@@ -0,0 +1,7 @@
+import os
+
+def handler (event, context):
+  os.system("gm version")
+  os.system("gm convert -list formats")
+  os.system("gm convert -list fonts")
+  return os.system('gm convert -font Courier -fill white -draw "rotate 20 text 10,10 Hello-World" image1.jpg /tmp/gm-test-output.jpg')