diff --git a/.woodpecker/build_dev.yml b/.woodpecker/build_dev.yml index 3cb0c57..4c03e75 100644 --- a/.woodpecker/build_dev.yml +++ b/.woodpecker/build_dev.yml @@ -10,14 +10,6 @@ when: event: [ push, manual ] steps: - - gen_tags: - image: docker - commands: - - pwd - - ./gen-version-list.sh "v2.0.4" php-${PHP_VERSION} - - cat tags.txt - dev_alpine_build_and_publish: image: woodpeckerci/plugin-docker-buildx settings: diff --git a/Dockerfile b/Dockerfile index d60ea31..ca022ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,8 @@ RUN apk add --no-cache \ php-exif \ php-xmlwriter \ php-tokenizer \ + php-simplexml \ + php-xmlreader \ composer \ npm \ && docker-php-ext-install filter pdo_mysql \ diff --git a/build/start-container.sh b/build/start-container.sh index 38c8251..31ccfce 100644 --- a/build/start-container.sh +++ b/build/start-container.sh @@ -4,7 +4,7 @@ set -e # install extra packages and extensions on first boot -if [[ ! -f /etc/first_boot ]]; then +if [[ $(id -u) -eq 0 && ! -f /etc/first_boot ]]; then if [[ -n "${EXTRA_APK_PACKAGES// /}" ]]; then # shellcheck disable=SC2086 apk add --no-cache $EXTRA_APK_PACKAGES @@ -23,7 +23,7 @@ fi if [[ "$BOOT_NPM_INSTALL" = true ]]; then echo "npm install" - npm install + npm install --cache /tmp/npm fi if [ ! -f /var/www/html/artisan ]; then