Merge pull request #1480 from bakaphp/feat-kanvas-on-arm

Feat-kanvas-on-arm

.github/workflows/deploy.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - '1.x'
-      - 'development'
 
   workflow_dispatch:
 

.github/workflows/ec2-deploy.yaml

@@ -1,6 +1,10 @@
 name: Deploy to EC2
 
 on:
+  push:
+    branches:
+      - 'development'
+
   workflow_dispatch:
 
 jobs:

development.Dockerfile

@@ -1,4 +1,9 @@
-FROM unit:php8.3
+FROM --platform=linux/arm64 unit:php8.3
+
+# # Define a build argument for the target architecture
+# ARG TARGETARCH
+# # Set an environment variable to use the architecture in commands
+# ENV ARCH=$TARGETARCH
 
 COPY ./docker/unit.json /docker-entrypoint.d/
 
@@ -39,8 +44,6 @@ COPY . /app
 # Install composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-RUN composer install --optimize-autoloader
-
 
 # add root to www group
 # RUN chmod -R ug+w var/www/html/storage
@@ -51,4 +54,6 @@ RUN cp docker/php.ini /usr/local/etc/php/conf.d/zx-app-config.ini
 
 WORKDIR /var/www/html/
 
+RUN composer install --optimize-autoloader
+
 EXPOSE 8080

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
     php:
         container_name: php${APP_CONTAINER_NAME}