Skip to content

Commit

Permalink
Fixes arm32v6 build
Browse files Browse the repository at this point in the history
  • Loading branch information
jaymoulin committed Sep 15, 2020
1 parent cd22bc9 commit f633627
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ qemu-arm-static:
cp /usr/bin/qemu-arm-static .
qemu-aarch64-static:
cp /usr/bin/qemu-aarch64-static .
build: qemu-aarch64-static qemu-arm-static
build: qemu-aarch64-static qemu-arm-static build/test-image
docker run --rm -v ${PWD}:/app/ yamete:test php composer.phar install --no-dev -o; \
$(foreach arch,$(archs), \
cat docker/Dockerfile | sed "s/FROM php/FROM ${arch}\/php/g" > Dockerfile; \
docker build -t jaymoulin/yamete:${VERSION}-$(arch) --build-arg VERSION=${VERSION} ${CACHE} .;\
Expand Down
8 changes: 1 addition & 7 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@ RUN apk add zlib-dev libzip-dev libgd gd-dev libpng-dev libwebp-dev libjpeg-turb
chmod go+wx /app && \
docker-php-ext-configure gd --with-webp --with-jpeg && \
docker-php-ext-install -j$(nproc) gd && \
docker-php-ext-install -j$(nproc) zip && \
docker-php-ext-install -j$(nproc) bcmath && \
apk add wget git --virtual .build-deps && \
wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --quiet && \
php composer.phar install --no-dev -o && \
rm composer.phar && \
apk del wget --purge .build-deps
docker-php-ext-install -j$(nproc) zip

VOLUME ['/app/downloads']

Expand Down

0 comments on commit f633627

Please sign in to comment.