diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15baf63e..73e85d13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,7 @@ jobs: php-version: ${{ matrix.php-version }} tools: composer - run: composer install --no-interaction --prefer-dist --ignore-platform-req=ext-openswoole - - run: ./vendor/bin/rr get --no-interaction --location bin/ && chmod +x bin/rr + - run: ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr - run: composer test:api:rr sqlite-db-tests: diff --git a/.gitignore b/.gitignore index daea5f2f..283d5b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .idea -bin/.rr.* bin/rr config/roadrunner/.pid build diff --git a/Dockerfile b/Dockerfile index 0dd2d8ff..c0120921 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,7 +62,7 @@ LABEL maintainer="Alejandro Celaya " COPY --from=builder /etc/shlink . RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink && \ if [ "$SHLINK_RUNTIME" == 'rr' ]; then \ - php ./vendor/bin/rr get --no-interaction --location bin/ && chmod +x bin/rr ; \ + php ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr ; \ fi; # Expose default port diff --git a/composer.json b/composer.json index 2dd10f8a..719d392d 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "shlinkio/shlink-ip-geolocation": "^3.2", "shlinkio/shlink-json": "^1.0", "spiral/roadrunner": "^2023.1", - "spiral/roadrunner-cli": "^2.4", + "spiral/roadrunner-cli": "^2.5", "spiral/roadrunner-http": "^3.0", "spiral/roadrunner-jobs": "^4.0", "symfony/console": "^6.2", diff --git a/data/infra/roadrunner.Dockerfile b/data/infra/roadrunner.Dockerfile index 383099e4..457a416f 100644 --- a/data/infra/roadrunner.Dockerfile +++ b/data/infra/roadrunner.Dockerfile @@ -71,6 +71,6 @@ CMD \ # Install dependencies if the vendor dir does not exist if [[ ! -d "./vendor" ]]; then /usr/local/bin/composer install ; fi && \ # Download roadrunner binary - if [[ ! -f "./bin/rr" ]]; then ./vendor/bin/rr get --no-interaction --location bin/ && chmod +x bin/rr ; fi && \ + if [[ ! -f "./bin/rr" ]]; then ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr ; fi && \ # This forces the app to be started every second until the exit code is 0 until ./bin/rr serve -c config/roadrunner/.rr.dev.yml; do sleep 1 ; done