Skip to content
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
11 changes: 6 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
FROM php:7.4.33-apache
FROM eclipse-temurin:11-jre AS builder

FROM php:8.5.11-apache

RUN docker-php-source extract \
&& docker-php-ext-install mysqli \
&& docker-php-source delete

# Java is necessary for the direct calls to the evaluation engine (in Api_splits.php)
RUN sed -i 's|deb.debian.org/debian-security|archive.debian.org/debian-security|g' /etc/apt/sources.list \
&& apt update \
&& apt install -y --no-install-recommends openjdk-11-jre
ENV JAVA_HOME=/opt/java/openjdk
ENV PATH="${JAVA_HOME}/bin:${PATH}"
COPY --from=builder $JAVA_HOME $JAVA_HOME

ENV MAX_REQUEST_WORKERS=152

Expand Down
2 changes: 1 addition & 1 deletion openml_OS/libraries/ElasticSearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ function roundnum($i) {
private function fetch_evaluations($min, $max, $include_folds=True) {
$index = array();
if($include_folds){
$folddata = $this->db->query('SELECT e.source, m.name AS function, e.fold, e.`repeat`, e.value FROM evaluation_fold e, math_function m WHERE e.function_id = m.id AND source >= ' . $min . ' and source < ' . $max);
$folddata = $this->db->query('SELECT e.source, m.name AS `function`, e.fold, e.`repeat`, e.value FROM evaluation_fold e, math_function m WHERE e.function_id = m.id AND source >= ' . $min . ' and source < ' . $max);
$allfolds = array();

if ($folddata) {
Expand Down