mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-11 02:52:56 +01:00
Add graphicsmagick versioned feature
This commit is contained in:
parent
9dadb28021
commit
72747ef3ca
5 changed files with 73 additions and 9 deletions
|
|
@ -45,7 +45,7 @@ before_script:
|
||||||
.build_and_deploy_custom: &build_and_deploy_custom
|
.build_and_deploy_custom: &build_and_deploy_custom
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- ./scripts/custom-docker-build $CI_BUILD_NAME -t "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
|
- ./scripts/custom-docker-build $CI_JOB_NAME -t "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
|
||||||
- docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
|
- docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
|
@ -75,6 +75,7 @@ ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test
|
||||||
ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
||||||
ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
||||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
||||||
|
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
|
||||||
|
|
||||||
# Not used anymore (?)
|
# Not used anymore (?)
|
||||||
golang-1.9-git-2.9.0 test: *test_custom
|
golang-1.9-git-2.9.0 test: *test_custom
|
||||||
|
|
@ -130,6 +131,7 @@ ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *bu
|
||||||
ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
||||||
ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
||||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
||||||
|
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
|
||||||
|
|
||||||
# Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)
|
# Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)
|
||||||
node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
|
node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,12 @@ ARG TERRAFORM_VERSION
|
||||||
ARG TERRAFORM_DOWNLOAD_SHA256
|
ARG TERRAFORM_DOWNLOAD_SHA256
|
||||||
RUN if [ -n "$TERRAFORM_VERSION" ] ; then /scripts/install-terraform $TERRAFORM_VERSION $TERRAFORM_DOWNLOAD_SHA256; fi
|
RUN if [ -n "$TERRAFORM_VERSION" ] ; then /scripts/install-terraform $TERRAFORM_VERSION $TERRAFORM_DOWNLOAD_SHA256; fi
|
||||||
|
|
||||||
|
# GraphicsMagick
|
||||||
|
ARG GRAPHISMAGICK_VERSION
|
||||||
|
ARG GRAPHISMAGICK_DOWNLOAD_URL=http://ftp.icm.edu.pl/pub/unix/graphics/GraphicsMagick/1.3/GraphicsMagick-${GRAPHISMAGICK_VERSION}.tar.gz
|
||||||
|
ARG GRAPHISMAGICK_DOWNLOAD_SHA256
|
||||||
|
RUN if [ -n "$GRAPHISMAGICK_VERSION" ]; then /scripts/install-graphicsmagick && gm version; fi
|
||||||
|
|
||||||
RUN locale-gen en_US.UTF-8
|
RUN locale-gen en_US.UTF-8
|
||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
ENV LANGUAGE en_US:en
|
ENV LANGUAGE en_US:en
|
||||||
|
|
|
||||||
17
README.md
17
README.md
|
|
@ -46,14 +46,15 @@ Each of the following parts represents another feature and version. Available
|
||||||
options are:
|
options are:
|
||||||
|
|
||||||
1. `golang`
|
1. `golang`
|
||||||
2. `git`
|
1. `git`
|
||||||
3. `chrome`
|
1. `chrome`
|
||||||
4. `node`
|
1. `node`
|
||||||
5. `yarn`
|
1. `yarn`
|
||||||
6. `phantomjs`
|
1. `phantomjs`
|
||||||
7. `postgres`
|
1. `postgres`
|
||||||
8. `terraform`
|
1. `terraform`
|
||||||
9. `ansible`
|
1. `ansible`
|
||||||
|
1. `graphicsmagick`
|
||||||
|
|
||||||
### Adding a new build
|
### Adding a new build
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -118,6 +118,19 @@ function print_terraform_args() {
|
||||||
printf -- "--build-arg TERRAFORM_DOWNLOAD_SHA256=%s " "$TERRAFORM_DOWNLOAD_SHA256"
|
printf -- "--build-arg TERRAFORM_DOWNLOAD_SHA256=%s " "$TERRAFORM_DOWNLOAD_SHA256"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function print_graphicsmagick_args() {
|
||||||
|
case "$1" in
|
||||||
|
1.3.29)
|
||||||
|
GRAPHISMAGICK_VERSION=1.3.29
|
||||||
|
GRAPHISMAGICK_DOWNLOAD_SHA256=de820cd10597205941a7e9d02c2e679231e92e8e769c204ef09034d2279ad453
|
||||||
|
;;
|
||||||
|
*) echo "Unknown graphicsmagick version $1"; exit 1;
|
||||||
|
esac
|
||||||
|
|
||||||
|
printf -- "--build-arg GRAPHISMAGICK_VERSION=%s " "$GRAPHISMAGICK_VERSION"
|
||||||
|
printf -- "--build-arg GRAPHISMAGICK_DOWNLOAD_SHA256=%s " "$GRAPHISMAGICK_DOWNLOAD_SHA256"
|
||||||
|
}
|
||||||
|
|
||||||
function parse_arguments() {
|
function parse_arguments() {
|
||||||
read base
|
read base
|
||||||
read base_version
|
read base_version
|
||||||
|
|
@ -141,6 +154,7 @@ function parse_arguments() {
|
||||||
postgresql) print_postgres_args $version ;;
|
postgresql) print_postgres_args $version ;;
|
||||||
ansible) print_ansible_args $version ;;
|
ansible) print_ansible_args $version ;;
|
||||||
terraform) print_terraform_args $version ;;
|
terraform) print_terraform_args $version ;;
|
||||||
|
graphicsmagick) print_graphicsmagick_args $version ;;
|
||||||
*) exit 1;;
|
*) exit 1;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
|
||||||
41
scripts/install-graphicsmagick
Executable file
41
scripts/install-graphicsmagick
Executable file
|
|
@ -0,0 +1,41 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -xeuo pipefail
|
||||||
|
IFS=$'\n\t'
|
||||||
|
|
||||||
|
mkdir build \
|
||||||
|
&& curl -fsSL "$GRAPHISMAGICK_DOWNLOAD_URL" -o graphicsmagick.tar.gz \
|
||||||
|
&& echo "$GRAPHISMAGICK_DOWNLOAD_SHA256 graphicsmagick.tar.gz" | sha256sum -c - \
|
||||||
|
&& tar -C build -xzf graphicsmagick.tar.gz \
|
||||||
|
&& cd build/GraphicsMagick-$GRAPHISMAGICK_VERSION \
|
||||||
|
&& chmod +x configure \
|
||||||
|
&& ./configure \
|
||||||
|
--prefix=/usr/local \
|
||||||
|
--disable-openmp \
|
||||||
|
--without-magick-plus-plus \
|
||||||
|
--with-perl=no \
|
||||||
|
--without-bzlib \
|
||||||
|
--without-dps \
|
||||||
|
--without-fpx \
|
||||||
|
--without-gslib \
|
||||||
|
--without-jbig \
|
||||||
|
--without-webp \
|
||||||
|
--without-jpeg \
|
||||||
|
--without-jp2 \
|
||||||
|
--without-lcms2 \
|
||||||
|
--without-lzma \
|
||||||
|
--with-png \
|
||||||
|
--with-sysroot=/usr/local \
|
||||||
|
--without-tiff \
|
||||||
|
--without-trio \
|
||||||
|
--without-ttf \
|
||||||
|
--without-umem \
|
||||||
|
--without-wmf \
|
||||||
|
--without-xml \
|
||||||
|
--with-zlib \
|
||||||
|
--without-x \
|
||||||
|
&& make \
|
||||||
|
&& make install \
|
||||||
|
&& cd ../.. \
|
||||||
|
&& rm -rf build \
|
||||||
|
&& rm graphicsmagick.tar.gz
|
||||||
Loading…
Add table
Add a link
Reference in a new issue