mirror of
https://github.com/invoiceninja/dockerfiles.git
synced 2025-12-31 19:47:25 +01:00
Merge pull request #703 from turbo124/master
Change the way we invoke install php extensions
This commit is contained in:
14
.github/workflows/build-image-v5.yaml
vendored
14
.github/workflows/build-image-v5.yaml
vendored
@@ -21,19 +21,6 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Add swap space
|
||||
run: |
|
||||
sudo fallocate -l 4G /swapfile
|
||||
sudo chmod 600 /swapfile
|
||||
sudo mkswap /swapfile
|
||||
sudo swapon /swapfile
|
||||
free -h
|
||||
|
||||
- name: Set MAKEFLAGS for parallel make jobs
|
||||
run: |
|
||||
export MAKEFLAGS="-j2"
|
||||
echo "MAKEFLAGS set to: $MAKEFLAGS"
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v1
|
||||
with:
|
||||
@@ -66,5 +53,6 @@ jobs:
|
||||
|
||||
- name: Move cache
|
||||
run: |
|
||||
mkdir -p /tmp/.buildx-cache
|
||||
rm -rf /tmp/.buildx-cache
|
||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
||||
@@ -51,7 +51,14 @@ RUN set -eux; \
|
||||
ttf-dejavu
|
||||
|
||||
# Install PHP extensions
|
||||
RUN ( curl -sSLf https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - || echo 'return 1' ) | sh -s \
|
||||
# RUN ( curl -sSLf https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - || echo 'return 1' ) | sh -s \
|
||||
# ${php_require} \
|
||||
# ${php_suggest} \
|
||||
# ${php_extra}
|
||||
|
||||
RUN wget -O /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \
|
||||
&& chmod +x /usr/local/bin/install-php-extensions \
|
||||
&& install-php-extensions \
|
||||
${php_require} \
|
||||
${php_suggest} \
|
||||
${php_extra}
|
||||
|
||||
Reference in New Issue
Block a user