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
22 changes: 4 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG DEVELOPMENT_BUILD
###############################################################################
# The base image for regular Debian-based images
###############################################################################
FROM php:8.3-apache-trixie AS cdash-debian-intermediate
FROM php:8.4-apache-trixie AS cdash-debian-intermediate

ARG BASE_IMAGE
ARG DEVELOPMENT_BUILD
Expand Down Expand Up @@ -133,7 +133,7 @@ ENTRYPOINT ["/bin/bash", "/cdash/docker/docker-entrypoint.sh"]
# The base image for UBI-based images
###############################################################################

FROM registry.access.redhat.com/ubi9/php-83 AS cdash-ubi-intermediate
FROM registry.access.redhat.com/ubi10/php-84 AS cdash-ubi-intermediate

ARG BASE_IMAGE
ARG DEVELOPMENT_BUILD
Expand Down Expand Up @@ -164,14 +164,7 @@ RUN dnf install -y \
git \
vim \
unzip \
zip \
#> cdash
php-bcmath \
php-gd \
php-ldap \
php-mbstring \
php-pdo \
php-opcache
zip

RUN if [ "$DEVELOPMENT_BUILD" = '1' ]; then \
dnf install -y \
Expand All @@ -181,18 +174,11 @@ RUN if [ "$DEVELOPMENT_BUILD" = '1' ]; then \
--noplugins \
--setopt=install_weak_deps=0 \
rsync \
#> A horrible hack to get a newer version of CMake. As of the time of this
#> writing, Red Hat UBI uses CMake 3.20, while our scripts require CMake>=3.22.
#> This should be replaced with a more acceptable solution at a future point
#> in time, whenever Red Had updates the default version of CMake.
python-pip && \
pip install cmake --upgrade && \
dnf remove -y python-pip; \
cmake; \
fi

# certs, timezone, accounts
RUN chmod -R g=u,o-w /etc/pki/ca-trust/extracted /etc/pki/ca-trust/source/anchors && \
update-ca-trust enable && \
update-ca-trust extract

# Allow PHP to access all environment variables.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"wiki": "http://public.kitware.com/Wiki/CDash"
},
"require": {
"php": "^8.3",
"php": "^8.4",
"ext-bcmath": "*",
"ext-curl": "*",
"ext-dom": "*",
Expand Down
6 changes: 0 additions & 6 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -7977,12 +7977,6 @@ parameters:
count: 1
path: app/cdash/app/Model/BuildConfigure.php

-
rawMessage: If condition is always false.
identifier: if.alwaysFalse
count: 1
path: app/cdash/app/Model/BuildConfigure.php

-
rawMessage: 'Method CDash\Model\BuildConfigure::AddLabel() has parameter $label with no type specified.'
identifier: missingType.parameter
Expand Down
2 changes: 1 addition & 1 deletion resources/providers/PingIdentity/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "^8.3",
"php": "^8.4",
"ext-json": "*",
"socialiteproviders/manager": "^4.8"
},
Expand Down
Loading