OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-24 09:50:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to rr-cli 2.5, and do not generate config

Browse Source
This commit is contained in:
Alejandro Celaya 2023-05-02 08:43:14 +02:00
parent e80b7448f5
commit a516ef691d
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -70,7 +70,7 @@ jobs:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
- run: composer install --no-interaction --prefer-dist --ignore-platform-req=ext-openswoole - 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 - run: composer test:api:rr
sqlite-db-tests: sqlite-db-tests:

1
.gitignore vendored
View File

@ -1,5 +1,4 @@
.idea .idea
bin/.rr.*
bin/rr bin/rr
config/roadrunner/.pid config/roadrunner/.pid
build build

2
Dockerfile
View File

@ -62,7 +62,7 @@ LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
COPY --from=builder /etc/shlink . COPY --from=builder /etc/shlink .
RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink && \ RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink && \
if [ "$SHLINK_RUNTIME" == 'rr' ]; then \ 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; fi;
# Expose default port # Expose default port

2
composer.json
View File

@ -53,7 +53,7 @@
"shlinkio/shlink-ip-geolocation": "^3.2", "shlinkio/shlink-ip-geolocation": "^3.2",
"shlinkio/shlink-json": "^1.0", "shlinkio/shlink-json": "^1.0",
"spiral/roadrunner": "^2023.1", "spiral/roadrunner": "^2023.1",
"spiral/roadrunner-cli": "^2.4", "spiral/roadrunner-cli": "^2.5",
"spiral/roadrunner-http": "^3.0", "spiral/roadrunner-http": "^3.0",
"spiral/roadrunner-jobs": "^4.0", "spiral/roadrunner-jobs": "^4.0",
"symfony/console": "^6.2", "symfony/console": "^6.2",

2
data/infra/roadrunner.Dockerfile
View File

@ -71,6 +71,6 @@ CMD \
# Install dependencies if the vendor dir does not exist # Install dependencies if the vendor dir does not exist
if [[ ! -d "./vendor" ]]; then /usr/local/bin/composer install ; fi && \ if [[ ! -d "./vendor" ]]; then /usr/local/bin/composer install ; fi && \
# Download roadrunner binary # 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 # 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 until ./bin/rr serve -c config/roadrunner/.rr.dev.yml; do sleep 1 ; done