Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #1968

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Update dependencies #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN MODE=$([ "$NO_DEV" = "0" ] && echo "development" || echo "production") \
RUN if [ "$NO_DEV" = "0" ]; \
then \
docker-php-ext-install pcntl \
&& pecl install xdebug-3.3.2 > /dev/null \
&& pecl install xdebug-3.4.0 > /dev/null \
&& docker-php-ext-enable xdebug \
&& echo "xdebug.output_dir = /tmp/xdebug" > "$PHP_INI_DIR/conf.d/xdebug.ini" \
&& mkdir /tmp/xdebug; \
Expand All @@ -48,7 +48,7 @@ RUN sed -i 's/AllowOverride All/AllowOverride None/g' /etc/apache2/conf-enabled/
WORKDIR /smr/

RUN curl -sS https://getcomposer.org/installer | \
php -- --install-dir=/usr/local/bin --filename=composer --version=2.7.4
php -- --install-dir=/usr/local/bin --filename=composer --version=2.8.3

COPY composer.json .
RUN COMPOSER_NO_DEV=$NO_DEV composer update --no-interaction
Expand Down
2 changes: 1 addition & 1 deletion api-docs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM php:8.3.8-cli-alpine AS builder

RUN curl -L -O https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.5.0/phpDocumentor.phar
RUN curl -L -O https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.5.3/phpDocumentor.phar
RUN chmod +x phpDocumentor.phar
RUN mv phpDocumentor.phar /usr/local/bin/phpdoc

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ services:
<<: *smr-cli

traefik:
image: traefik:3.0
image: traefik:3.2
networks:
- frontend
volumes:
Expand Down
2 changes: 1 addition & 1 deletion src/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
const SMR_FILE_VERSION = '1.07';

const JQUERY_URL = 'https://code.jquery.com/jquery-3.7.1.min.js';
const JQUERYUI_URL = 'https://code.jquery.com/ui/1.13.3/jquery-ui.min.js';
const JQUERYUI_URL = 'https://code.jquery.com/ui/1.14.1/jquery-ui.min.js';
const LISTJS_URL = 'https://cdnjs.cloudflare.com/ajax/libs/list.js/2.3.1/list.min.js';
const WIKI_URL = 'https://wiki.smrealms.de';
const DISCORD_URL = 'https://discord.me/smrealms';
Expand Down
Loading