Merge pull request GoogleCloudPlatform#68 from hxiong388/add-imagemagick

Install imagemagick in base image
yosatak · Jan 26, 2017 · a38ad51 · a38ad51
2 parents 3dde96e + d8bce12
commit a38ad51
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/appengine/image_files/Dockerfile b/appengine/image_files/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get update -y && \
         curl \
         git \
         file \
+        imagemagick \
         libffi-dev \
         libgdbm-dev \
         libgmp-dev \

diff --git a/appengine/image_files/test_base_image.json b/appengine/image_files/test_base_image.json
@@ -25,6 +25,11 @@
 			"name": "test_rails_env_var",
 			"command": ["ruby", "-e", "puts ENV[\"RAILS_ENV\"]"],
 			"expectedOutput": ["production\n"]
+		},
+		{
+			"name": "test_imagemagick_installation",
+			"command": ["convert", "-version"],
+			"expectedOutput": ["Version: ImageMagick [0-9]+\\.\\d+.*"]
 		}
 	],
 	"licenseTests": [