update merger

Dockerfile

@@ -28,8 +28,8 @@ WORKDIR /var/www/html
 COPY . .
 
 RUN chmod +x artisan
-#RUN composer install --ignore-platform-reqs --prefer-dist --no-scripts --no-progress --no-interaction --no-dev --no-autoloader
+RUN composer install --ignore-platform-reqs --prefer-dist --no-scripts --no-progress --no-interaction --no-dev --no-autoloader
-#RUN composer dump-autoload --optimize
+RUN composer dump-autoload --optimize
 
 RUN chown -R www-data:www-data .
 

docker-compose.yml

@@ -5,10 +5,10 @@ services:
         restart: unless-stopped
         tty: true
         ports:
-            - '80:80'
+            - '8099:80'
-            - '443:443'
+            - '449:443'
         volumes:
-            - .:/var/www/html:ro,cached
+            - .:/var/www/html
             - ./docker/nginx/conf.d/:/etc/nginx/conf.d/
         links:
             - app
@@ -29,8 +29,9 @@ services:
         environment:
             - POSTGRES_USER=postgres
             - POSTGRES_PASSWORD=postgres
+            - SERVICE_NAME=postgres
         ports:
-            - '5432:5432'
+            - '5439:5432'
         networks:
             - ospro
         volumes:

rest-client.http

@@ -1,10 +1,12 @@
-@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvYXBpLXN0YWdpbmctYWR3Lm9zcHJvLmlkXC9hcGlcL2xvZ2luIiwiaWF0IjoxNjU4ODkzMjc1LCJleHAiOjE2NTk0OTgwNzUsIm5iZiI6MTY1ODg5MzI3NSwianRpIjoiRDhQdncycEk5amF3cGFwaSIsInN1YiI6MSwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.-8a1JKilV1wHsmrIpS-j67sQukJtQ3sACGc3a6G6nXY
+@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvYXBpLXN0YWdpbmctYWR3Lm9zcHJvLmlkXC9hcGlcL2xvZ2luIiwiaWF0IjoxNjU5NDc0MDY3LCJleHAiOjE2NjAwNzg4NjcsIm5iZiI6MTY1OTQ3NDA2NywianRpIjoia0ljaHBFOEpiaFI0TjN3UyIsInN1YiI6MSwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.PxGL0NcRtxzhG2J21Ca-zgMbr1anY7vhNzEOpZHSNOk
 
 
 # @hostname = https://kit-api.ospro.id/api
 # @hostname = https://ospro-api.ospro.id/api
 # @hostname = https://api-iu.ospro.id/api
-@hostname = https://api-staging-adw.ospro.id/api
+# @hostname = https://api-staging-adw.ospro.id/api
+@hostname = http://localhost:8099/api
+# @hostname = http://103.73.125.81:8444/api
 
 ###### login 
 POST {{hostname}}/login
@@ -733,7 +735,7 @@ Authorization: Bearer {{token}}
 content-type: application/json
 
 { 
-    "project_id": [29], 
+    "project_id": [47], 
     "period": "week"
 }