Issue 60 and 53 (#66)

* Move .env.example

* No need to set user in development

* Update packages

* Fix compile warnings

* Issues #60 #53

.devcontainer/docker-compose.yml

@@ -18,7 +18,7 @@ services:
     volumes:
       - ../api:/var/www/html
     working_dir: /var/www/html
-    command: /bin/sh -c "chown www-data:www-data entrypoint.sh && chmod +x entrypoint.sh && sh entrypoint.sh"
+    command: /bin/sh -c "sh entrypoint.sh"
     environment:
       APP_ENV: ${APP_ENV}
       APP_DEBUG: ${APP_DEBUG}
@@ -43,7 +43,7 @@ services:
     networks:
       - skynet
   db:
-    image: mysql:8
+    image: mysql:8.2.0
     ports:
       - "${DB_PORT}:3306"
     environment:

api/Dockerfile.dev

@@ -28,5 +28,5 @@ RUN set -xe \
 # Set working directory
 WORKDIR /var/www/html
 
-# Change the user to www-data
-USER www-data
+# Install dependencies
+RUN composer install --no-dev --optimize-autoloader

api/entrypoint.sh

@@ -1,18 +1,5 @@
 #!/bin/bash
 
-# Set permissions
-chmod -R 775 storage bootstrap/cache 
-chown -R www-data:www-data storage bootstrap/cache
-
-chown www-data:www-data ./entrypoint.sh 
-chmod +x ./entrypoint.sh
-
-# Install dependencies
-composer install --no-dev --optimize-autoloader
-
-# Sleep for wait to db container
-sleep 20;
-
 # Run key:generate
 # php artisan key:generate
 

docker/.env.example

@@ -4,7 +4,6 @@ APP_DEBUG=false
 HOST=localhost
 
 APP_PORT=8895
-API_PORT=8085
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1

docker/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     image: ghcr.io/budgetbee/budgetbee/proxy:latest
     command: nginx -g "daemon off;"
     ports:
-      - "8201:80"
+      - "${APP_PORT}:80"
     depends_on:
       - webserver
       - web
@@ -17,9 +17,9 @@ services:
     command: sh entrypoint.sh
     environment:
       DB_HOST: db
-      DB_DATABASE: "budgetbee"
-      DB_USERNAME: "budgetbee_user"
-      DB_PASSWORD: "budgetbee_password"
+      DB_DATABASE: ${DB_DATABASE}
+      DB_USERNAME: ${DB_USERNAME}
+      DB_PASSWORD: ${DB_PASSWORD}
     depends_on:
       db:
         condition: service_healthy
@@ -32,7 +32,7 @@ services:
     networks:
       - skynet
   db:
-    image: mysql:8
+    image: mysql:8.2.0
     command: --default-authentication-plugin=mysql_native_password
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}

web/Dockerfile

@@ -1,16 +1,18 @@
 # pull official base image
-FROM node:20.3-slim
+FROM node:21-slim
 
 # set working directory
 WORKDIR /var/www/html
 
-# install app dependencies
-COPY package.json package-lock.json ./
-RUN npm install
-
 # add app
 COPY . .
 
+# install app dependencies
+RUN rm -rf node_modules
+# COPY package.json package-lock.json ./
+RUN npm ci
+
+
 # port
 EXPOSE 3000
 

web/Dockerfile.dev

@@ -1,5 +1,5 @@
 # pull official base image
-FROM node:20.3-slim
+FROM node:21-slim
 
 # set working directory
 WORKDIR /var/www/html