From f17948397fc285ddfca2abab21480ab94c493ae0 Mon Sep 17 00:00:00 2001 From: Jean-Gabriel Gill-Couture Date: Sun, 27 Apr 2025 15:55:12 -0400 Subject: [PATCH] feat: escape PHP_ERROR_REPORTING value in Dockerfile Escapes the value of the PHP_ERROR_REPORTING environment variable in the Dockerfile to prevent potential issues with shell interpretation. Uses EnvBuilder for a more structured approach. --- harmony/src/modules/lamp.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/harmony/src/modules/lamp.rs b/harmony/src/modules/lamp.rs index 928e8b7..f83ded2 100644 --- a/harmony/src/modules/lamp.rs +++ b/harmony/src/modules/lamp.rs @@ -101,8 +101,8 @@ impl Interpret for LAMPInterpret { } } -use dockerfile_builder::Dockerfile; use dockerfile_builder::instruction::{CMD, COPY, ENV, EXPOSE, FROM, RUN, WORKDIR}; +use dockerfile_builder::{Dockerfile, instruction_builder::EnvBuilder}; use std::fs; impl LAMPInterpret { @@ -126,9 +126,13 @@ impl LAMPInterpret { // Set environment variables for PHP configuration dockerfile.push(ENV::from("PHP_MEMORY_LIMIT=256M")); dockerfile.push(ENV::from("PHP_MAX_EXECUTION_TIME=30")); - dockerfile.push(ENV::from( - "PHP_ERROR_REPORTING=E_ERROR | E_WARNING | E_PARSE", - )); + dockerfile.push( + EnvBuilder::builder() + .key("PHP_ERROR_REPORTING") + .value("\"E_ERROR | E_WARNING | E_PARSE\"") + .build() + .unwrap(), + ); // Install necessary PHP extensions and dependencies dockerfile.push(RUN::from(