diff --git a/Language/php/7.4/Dockerfile b/Language/php/7.4/Dockerfile index fdba0406..68856f52 100644 --- a/Language/php/7.4/Dockerfile +++ b/Language/php/7.4/Dockerfile @@ -1,10 +1,7 @@ FROM ghcr.io/labring-actions/devbox/debian-ssh-12.6:a5f75b3 +# Set the user to root +USER root -RUN cd /home/devbox/project && \ - rm -rf ./* - -COPY /Language/php/project /home/devbox/project - RUN apt update && \ apt install -y apt-transport-https lsb-release ca-certificates wget && \ wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \ @@ -12,11 +9,15 @@ RUN apt update && \ apt update && \ apt install -y php7.4 php7.4-cli php7.4-common php7.4-xml php-pear php7.4-mbstring php-pgsql php-mysql php-mongo php-redis && \ curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \ - chown -R devbox:devbox /home/devbox/project && \ - chmod -R u+rw /home/devbox/project && \ - rm -rf /var/lib/apt/lists/* && \ - chmod -R +x /home/devbox/project/entrypoint.sh - + rm -rf /var/lib/apt/lists/* + COPY /Language/php/php.ini /etc/php/7.4/apache2/php.ini -RUN mkdir /root/.devbox \ No newline at end of file +USER devbox + +RUN mkdir -p /home/devbox/.devbox && \ + if [ -d /home/devbox/project ]; then rm -rf /home/devbox/project/*; fi + +COPY --chown=devbox:devbox /Language/php/project /home/devbox/project + +RUN chmod +x /home/devbox/project/entrypoint.sh \ No newline at end of file diff --git a/Language/php/8.2.20/Dockerfile b/Language/php/8.2/Dockerfile similarity index 68% rename from Language/php/8.2.20/Dockerfile rename to Language/php/8.2/Dockerfile index df6e12b1..d0df6317 100644 --- a/Language/php/8.2.20/Dockerfile +++ b/Language/php/8.2/Dockerfile @@ -1,9 +1,6 @@ FROM ghcr.io/labring-actions/devbox/debian-ssh-12.6:a5f75b3 - -RUN cd /home/devbox/project && \ -rm -rf ./* - -COPY /Language/php/project /home/devbox/project +# Set the user to root +USER root RUN apt update && \ apt install -y apt-transport-https lsb-release ca-certificates wget && \ @@ -12,11 +9,15 @@ RUN apt update && \ apt update && \ apt install -y php8.2 php8.2-cli php8.2-common php8.2-xml php-pear php8.2-mbstring php-pgsql php-mysql php-mongo php-redis && \ curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \ - chown -R devbox:devbox /home/devbox/project && \ - chmod -R u+rw /home/devbox/project && \ - rm -rf /var/lib/apt/lists/* && \ - chmod -R +x /home/devbox/project/entrypoint.sh + rm -rf /var/lib/apt/lists/* COPY /Language/php/php.ini /etc/php/8.2/apache2/php.ini -RUN mkdir /root/.devbox \ No newline at end of file +USER devbox + +RUN mkdir -p /home/devbox/.devbox && \ + if [ -d /home/devbox/project ]; then rm -rf /home/devbox/project/*; fi + +COPY --chown=devbox:devbox /Language/php/project /home/devbox/project + +RUN chmod +x /home/devbox/project/entrypoint.sh \ No newline at end of file