diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index f0347a8..44bcc43 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -26,8 +26,7 @@ jobs: cd /home/pkirillw/dockered-services/max-bot-test && git pull origin main else cd /home/pkirillw/dockered-services && git clone https://git.pkirillw-server.ru/pkirillw/max-bot-test.git - fi - chmod -R 777 /home/pkirillw/dockered-services/max-bot-test/storage" + fi" - name: Create .env file env: diff --git a/Dockerfile b/Dockerfile index 1f08ae6..b75511c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,19 @@ FROM php:8.4-fpm-alpine AS base +ARG HOST_UID=1000 +ARG HOST_GID=1000 + RUN apk add --no-cache \ libzip-dev \ zlib-dev \ unzip \ git \ curl \ + shadow \ && docker-php-ext-install zip pcntl \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ + && groupmod -g $HOST_GID www-data \ + && usermod -u $HOST_UID -g $HOST_GID www-data WORKDIR /var/www/html