Skip to content

Commit

Permalink
Merge pull request #2 from azonedev/support-8.2
Browse files Browse the repository at this point in the history
update PHP version 8.2
  • Loading branch information
azonedev authored Mar 27, 2024
2 parents 762b867 + 6be87f1 commit 1e80bf2
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .docker/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-fpm-alpine
FROM php:8.2-fpm-alpine

ARG SERVER_ENVIRONMENT

Expand Down
2 changes: 1 addition & 1 deletion .docker/nginx/app/app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ server {

location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass laradok_app:9000;
fastcgi_pass app:9000;
fastcgi_index index.php;
# For comfortable debugging
fastcgi_read_timeout 1000;
Expand Down
2 changes: 1 addition & 1 deletion .docker/worker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-cli-alpine
FROM php:8.2.1-cli-alpine

# Add Repositories
RUN rm -f /etc/apk/repositories &&\
Expand Down
32 changes: 16 additions & 16 deletions docker-compose.yml.example
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
version: '3'
services:
#Nginx Service
laradok_nginx:
nginx:
image: nginx:latest
container_name: laradok_nginx
container_name: nginx
tty: true
ports:
- 8081:80
- "8081:80"
volumes:
- ./.docker/nginx/nginx.conf:/etc/nginx/nginx.conf
- ./.docker/nginx/app/app.conf:/etc/nginx/conf.d/default.conf
depends_on:
- laradok_app
- app
links:
- laradok_app
- app
environment:
- X_SERVER_TYPE=nginx
networks:
- laradok-network

#PHP Service
laradok_app:
app:
build:
context: .
dockerfile: ./.docker/app/Dockerfile
container_name: laradok_app
container_name: app
volumes:
- ./app:/var/www/app
restart: always
Expand All @@ -34,11 +34,11 @@ services:
- laradok-network

#Worker Service
laradok_worker:
worker:
build:
context: .
dockerfile: ./.docker/worker/Dockerfile
container_name: laradok_worker
container_name: worker
volumes:
- ./app:/var/www/app
- ./storage/logs/worker:/var/log
Expand All @@ -50,9 +50,9 @@ services:
- laradok-network

#MySQL Service
laradok_db:
db:
image: mysql:latest
container_name: laradok_db
container_name: db
restart: always
environment:
MYSQL_DATABASE: ${DB_NAME}
Expand All @@ -65,19 +65,19 @@ services:
- laradok-network

#mailhog service for testing emails
laradok_mailhog:
mailhog:
image: mailhog/mailhog
container_name: laradok_mailhog
container_name: mailhog
logging:
driver: 'none' # disable saving logs
ports:
- 1025:1025 # smtp server
- 8025:8025 # web ui
- "1025:1025" # smtp server
- "8025:8025" # web ui
networks:
- laradok-network

#REDIS
laradok_redis:
redis:
image: redis:latest
container_name: redis
ports:
Expand Down
4 changes: 2 additions & 2 deletions install.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ sudo chmod -R 777 app/bootstrap/cache

#laravel dependencies
echo "Installing laravel dependencies"
docker-compose exec laradok_worker composer install --prefer-source
docker-compose exec worker composer install --prefer-source
echo "Generating laravel key"
docker-compose exec laradok_app php artisan key:generate
docker-compose exec app php artisan key:generate

#up containers
echo "Re-start containers"
Expand Down

0 comments on commit 1e80bf2

Please sign in to comment.