Merge pull request #113 from nextcloud/multi-arch
Add multi arch support
This commit is contained in:
Tilo Spannagel
GitHub
commit
58b8d16719
19
.travis.yml
19
.travis.yml
@ -11,6 +11,7 @@ install:
|
|||||||
before_script:
|
before_script:
|
||||||
- env | sort
|
- env | sort
|
||||||
- image="nextcloud:${VERSION}${VARIANT:+-$VARIANT}"
|
- image="nextcloud:${VERSION}${VARIANT:+-$VARIANT}"
|
||||||
|
- if [[ "$ARCH" == 'i386' ]]; then sed -i -e 's/FROM php/FROM i386\/php/g' "${VERSION}/${VARIANT}/Dockerfile"; fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- travis_retry docker build -t "$image" "${VERSION}/${VARIANT}"
|
- travis_retry docker build -t "$image" "${VERSION}/${VARIANT}"
|
||||||
@ -40,9 +41,15 @@ jobs:
|
|||||||
- ./generate-stackbrew-library.sh
|
- ./generate-stackbrew-library.sh
|
||||||
|
|
||||||
- stage: test images
|
- stage: test images
|
||||||
env: VERSION=10.0 VARIANT=fpm
|
env: VERSION=10.0 VARIANT=fpm ARCH=amd64
|
||||||
- env: VERSION=10.0 VARIANT=apache
|
- env: VERSION=10.0 VARIANT=fpm ARCH=i386
|
||||||
- env: VERSION=11.0 VARIANT=fpm
|
- env: VERSION=10.0 VARIANT=apache ARCH=amd64
|
||||||
- env: VERSION=11.0 VARIANT=apache
|
- env: VERSION=10.0 VARIANT=apache ARCH=i386
|
||||||
- env: VERSION=12.0 VARIANT=fpm
|
- env: VERSION=11.0 VARIANT=fpm ARCH=amd64
|
||||||
- env: VERSION=12.0 VARIANT=apache
|
- env: VERSION=11.0 VARIANT=fpm ARCH=i386
|
||||||
|
- env: VERSION=11.0 VARIANT=apache ARCH=amd64
|
||||||
|
- env: VERSION=11.0 VARIANT=apache ARCH=i386
|
||||||
|
- env: VERSION=12.0 VARIANT=fpm ARCH=amd64
|
||||||
|
- env: VERSION=12.0 VARIANT=fpm ARCH=i386
|
||||||
|
- env: VERSION=12.0 VARIANT=apache ARCH=amd64
|
||||||
|
- env: VERSION=12.0 VARIANT=apache ARCH=i386
|
||||||
|
|||||||
@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
||||||
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
|
||||||
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
|
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
||||||
|
&& docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \
|
||||||
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip
|
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
|
|||||||
@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
||||||
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
|
||||||
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
|
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
||||||
|
&& docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \
|
||||||
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip
|
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
|
|||||||
@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
||||||
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
|
||||||
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
|
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
||||||
|
&& docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \
|
||||||
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
|
|||||||
@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
||||||
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
|
||||||
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
|
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
||||||
|
&& docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \
|
||||||
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
|
|||||||
@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
||||||
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
|
||||||
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
|
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
||||||
|
&& docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \
|
||||||
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
|
|||||||
@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
||||||
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
|
||||||
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
|
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
||||||
|
&& docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \
|
||||||
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
|
|||||||
@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
||||||
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
|
||||||
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
|
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
||||||
|
&& docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \
|
||||||
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
|
|||||||
@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
|
||||||
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
|
||||||
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
|
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
||||||
|
&& docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \
|
||||||
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip
|
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
|
|||||||
@ -73,6 +73,7 @@ for version in "${versions[@]}"; do
|
|||||||
cat <<-EOE
|
cat <<-EOE
|
||||||
|
|
||||||
Tags: $(join ', ' "${variantAliases[@]}")
|
Tags: $(join ', ' "${variantAliases[@]}")
|
||||||
|
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
|
||||||
GitCommit: $commit
|
GitCommit: $commit
|
||||||
Directory: $version/$variant
|
Directory: $version/$variant
|
||||||
EOE
|
EOE
|
||||||
|
|||||||
@ -59,7 +59,9 @@ for latest in "${latests[@]}"; do
|
|||||||
# Copy apps.config.php
|
# Copy apps.config.php
|
||||||
cp apps.config.php "$version/$variant/apps.config.php"
|
cp apps.config.php "$version/$variant/apps.config.php"
|
||||||
|
|
||||||
travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant$travisEnv"
|
for arch in i386 amd64; do
|
||||||
|
travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
|
||||||
|
done
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user