OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-12-18 05:10:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update docker images to Alpine 3.21

Browse Source
This commit is contained in:
Alejandro Celaya 2024-12-12 08:51:23 +01:00
parent 88c283952c
commit 9e34183901
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM php:8.4-alpine3.20 AS base FROM php:8.4-alpine3.21 AS base
ARG SHLINK_VERSION=latest ARG SHLINK_VERSION=latest
ENV SHLINK_VERSION ${SHLINK_VERSION} ENV SHLINK_VERSION ${SHLINK_VERSION}

2
data/infra/php.Dockerfile
View File

@ -1,4 +1,4 @@
FROM php:8.4-fpm-alpine3.20 FROM php:8.4-fpm-alpine3.21
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.24 ENV APCU_VERSION 5.1.24

2
data/infra/roadrunner.Dockerfile
View File

@ -1,4 +1,4 @@
FROM php:8.4-alpine3.20 FROM php:8.4-alpine3.21
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV PDO_SQLSRV_VERSION 5.12.0 ENV PDO_SQLSRV_VERSION 5.12.0

2
module/Core/src/Geolocation/GeolocationDbUpdater.php
View File

@ -47,7 +47,7 @@ class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
} }
$lock = $this->locker->createLock(self::LOCK_NAME); $lock = $this->locker->createLock(self::LOCK_NAME);
$lock->acquire(true); // Block until lock is released $lock->acquire(blocking: true);
try { try {
return $this->downloadIfNeeded($downloadProgressHandler); return $this->downloadIfNeeded($downloadProgressHandler);

4
module/Core/src/ShortUrl/Resolver/PersistenceShortUrlRelationResolver.php
View File

@ -106,8 +106,8 @@ class PersistenceShortUrlRelationResolver implements ShortUrlRelationResolverInt
{ {
// Lock dependency creation for up to 5 seconds. This will prevent errors when trying to create the same one // Lock dependency creation for up to 5 seconds. This will prevent errors when trying to create the same one
// more than once in parallel. // more than once in parallel.
$locks[$name] = $lock = $this->locker->createLock($name, 5); $locks[$name] = $lock = $this->locker->createLock($name, ttl: 5);
$lock->acquire(true); $lock->acquire(blocking: true);
} }
/** /**