diff --git a/Dockerfile b/Dockerfile index f122b062..0d3cc037 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN \ # Install swoole # First line fixes an error when installing pecl extensions. Found in https://github.com/docker-library/php/issues/233 -RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS && \ +RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} && \ pecl install swoole-${SWOOLE_VERSION} && \ docker-php-ext-enable swoole && \ apk del .phpize-deps diff --git a/build.sh b/build.sh index 304a0ac9..cf42695b 100755 --- a/build.sh +++ b/build.sh @@ -17,36 +17,15 @@ echo 'Copying project files...' rm -rf "${builtcontent}" mkdir -p "${builtcontent}" rsync -av * "${builtcontent}" \ - --exclude=bin/test \ - --exclude=data/infra \ - --exclude=data/cache/* \ - --exclude=data/log/* \ - --exclude=data/locks/* \ - --exclude=data/proxies/* \ - --exclude=data/migrations_template.txt \ - --exclude=data/GeoLite2-City.* \ - --exclude=data/database.sqlite \ - --exclude=data/shlink-tests.db \ - --exclude=**/.gitignore \ - --exclude=CHANGELOG.md \ - --exclude=composer.lock \ - --exclude=vendor \ - --exclude=docs \ --exclude=*docker* \ - --exclude=php* \ - --exclude=infection.json \ - --exclude=phpstan.neon \ - --exclude=config/autoload/*local* \ - --exclude=config/test \ - --exclude=**/test* \ - --exclude=build* \ - --exclude=.github + --exclude=Dockerfile \ + --exclude-from=./.dockerignore cd "${builtcontent}" # Install dependencies echo "Installing dependencies with $composerBin..." ${composerBin} self-update -${composerBin} install --no-dev --optimize-autoloader --apcu-autoloader --no-progress --no-interaction +${composerBin} install --no-dev --optimize-autoloader --no-progress --no-interaction # Delete development files echo 'Deleting dev files...'