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.

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 docker images to Alpine 3.21 #2306

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.4-alpine3.20 AS base
FROM php:8.4-alpine3.21 AS base

ARG SHLINK_VERSION=latest
ENV SHLINK_VERSION ${SHLINK_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion data/infra/php.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.4-fpm-alpine3.20
FROM php:8.4-fpm-alpine3.21
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>

ENV APCU_VERSION 5.1.24
Expand Down
2 changes: 1 addition & 1 deletion data/infra/roadrunner.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.4-alpine3.20
FROM php:8.4-alpine3.21
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>

ENV PDO_SQLSRV_VERSION 5.12.0
Expand Down
2 changes: 1 addition & 1 deletion module/Core/src/Geolocation/GeolocationDbUpdater.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function checkDbUpdate(
}

$lock = $this->locker->createLock(self::LOCK_NAME);
$lock->acquire(true); // Block until lock is released
$lock->acquire(blocking: true);

try {
return $this->downloadIfNeeded($downloadProgressHandler);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ private function lock(array &$locks, string $name): void
{
// Lock dependency creation for up to 5 seconds. This will prevent errors when trying to create the same one
// more than once in parallel.
$locks[$name] = $lock = $this->locker->createLock($name, 5);
$lock->acquire(true);
$locks[$name] = $lock = $this->locker->createLock($name, ttl: 5);
$lock->acquire(blocking: true);
}

/**
Expand Down