diff --git a/.dockerignore b/.dockerignore index 1c0203a..0ef470f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,7 @@ Dockerfile vendor/ .git +public/build/ +storage/app/repositories/* +storage/framework/*/* +storage/logs/* diff --git a/Dockerfile b/Dockerfile index a441d1b..349c533 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM composer:2.6.6 as composer -FROM php:8.1-apache-buster +FROM php:8.1-apache-bookworm RUN apt-get update && apt-get install -y zip @@ -10,6 +10,7 @@ RUN apt-get -y update \ && docker-php-ext-install intl RUN apt-get install -y \ + nodejs npm \ libfreetype6-dev \ libjpeg62-turbo-dev \ libpng-dev \ @@ -35,3 +36,5 @@ RUN chown -R www-data:www-data /var/www/html/bootstrap/cache || true COPY --from=composer /usr/bin/composer /usr/bin/composer RUN composer install --no-dev +RUN npm install +RUN npm run build diff --git a/docker-compose.yml b/docker-compose.yml index b9e44f9..426f173 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,8 @@ services: - APP_KEY - APP_URL=http://localhost:3000/ - ASSET_URL=http://localhost:3000/ - + volumes: + - ./storage/app/repositories/opg-data-ethiopia:/var/www/html/storage/app/repositories/opg-data-ethiopia/ web: image: osmapp ports: