Skip to content
Draft
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this

* [#2540](https://github.com/shlinkio/shlink/issues/2540) Update Symfony packages to 8.0.
* [#2512](https://github.com/shlinkio/shlink/issues/2512) Make all remaining console commands invokable.
* [#2555](https://github.com/shlinkio/shlink/issues/2555) Update docker image to PHP 8.5.

### Deprecated
* *Nothing*
Expand Down
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.4-alpine3.21 AS base
FROM php:8.5-alpine3.22 AS base

ARG SHLINK_VERSION=latest
ENV SHLINK_VERSION=${SHLINK_VERSION}
Expand All @@ -7,8 +7,8 @@ ENV SHLINK_RUNTIME=${SHLINK_RUNTIME}

ENV USER_ID='1001'
ENV PDO_SQLSRV_VERSION='5.12.0'
ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
ENV MS_ODBC_SQL_VERSION='18_18.4.1.1'
ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'
ENV LC_ALL='C'

WORKDIR /etc/shlink
Expand All @@ -25,15 +25,15 @@ RUN \
apk add --no-cache postgresql icu libzip libpng

# Install sqlsrv driver for x86_64 builds
RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \
if [ $(uname -m) == "x86_64" ]; then \
RUN if [ $(uname -m) == "x86_64" ]; then \
apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \
wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
apk add --allow-untrusted msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \
docker-php-ext-enable pdo_sqlsrv && \
rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk ; \
fi; \
apk del .phpize-deps
rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
apk del .phpize-deps; \
fi

# Install shlink
FROM base AS builder
Expand Down
6 changes: 3 additions & 3 deletions data/infra/frankenphp.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM dunglas/frankenphp:1-php8.4-alpine
FROM dunglas/frankenphp:1-php8.5-alpine
MAINTAINER Alejandro Celaya <[email protected]>

ENV PDO_SQLSRV_VERSION='5.12.0'
ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
ENV MS_ODBC_SQL_VERSION='18_18.4.1.1'
ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'

RUN apk update

Expand Down
6 changes: 3 additions & 3 deletions data/infra/php.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM php:8.4-fpm-alpine3.21
FROM php:8.5-fpm-alpine3.22
MAINTAINER Alejandro Celaya <[email protected]>

ENV APCU_VERSION='5.1.24'
ENV PDO_SQLSRV_VERSION='5.12.0'
ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
ENV MS_ODBC_SQL_VERSION='18_18.4.1.1'
ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'

RUN apk update

Expand Down
6 changes: 3 additions & 3 deletions data/infra/roadrunner.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM php:8.4-alpine3.21
FROM php:8.5-alpine3.22
MAINTAINER Alejandro Celaya <[email protected]>

ENV PDO_SQLSRV_VERSION='5.12.0'
ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
ENV MS_ODBC_SQL_VERSION='18_18.4.1.1'
ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'

RUN apk update

Expand Down
Loading