From c9c75452533b48241caa37879294ab2e4afbf4e1 Mon Sep 17 00:00:00 2001
From: yuta <eypc.ofun@gmail.com>
Date: Wed, 10 May 2023 01:04:09 +0900
Subject: [PATCH] fix github actions

---
 Dockerfile | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b601781..c3cb0ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 # For github action
-FROM php:8.2-fpm-buster as builder
+FROM php:8.2-apache
 
 COPY ./docker/php/php.ini /usr/local/etc/php/php.ini
-
-COPY ./laravel /laravel
-WORKDIR /laravel
+COPY ./docker/apache/000-default.conf /etc/apache2/sites-available/
+COPY ./laravel /var/www/laravel
+WORKDIR /var/www/laravel
 
 RUN apt-get update && \
   apt-get -y install git unzip libzip-dev libicu-dev libonig-dev && \
@@ -25,10 +25,4 @@ RUN php artisan cache:clear \
 
 RUN chown -R www-data:www-data storage
 
-
-FROM php:8.2-apache
-
-COPY ./docker/apache/000-default.conf /etc/apache2/sites-available/
-COPY --from=builder /laravel /var/www/laravel
-
 RUN a2ensite 000-default