diff --git a/Dockerfile.nginx b/Dockerfile.nginx new file mode 100644 index 0000000..f5fad2a --- /dev/null +++ b/Dockerfile.nginx @@ -0,0 +1,2 @@ +FROM nginx:1.25-alpine +COPY docker-nginx.conf /etc/nginx/conf.d/default.conf diff --git a/docker-compose.yml b/docker-compose.yml index dcf8b76..d77b2e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,11 @@ services: nginx: - image: nginx:1.25-alpine + build: + context: . + dockerfile: Dockerfile.nginx ports: - "80" volumes: - - ./docker-nginx.conf:/etc/nginx/conf.d/default.conf:ro - app-public:/var/www/html/public:ro - app-storage:/var/www/html/storage:ro depends_on: diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 1bbae1d..5ea6f23 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -26,7 +26,7 @@ try { if [ "$TABLE_COUNT" = "0" ]; then echo "Database is empty. Importing humicpro_aigo.sql..." - mysql -h mysql -u "${DB_USERNAME}" -p"${DB_PASSWORD}" "${DB_DATABASE}" < /var/www/html/humicpro_aigo.sql + mysql -h mysql --ssl=0 -u "${DB_USERNAME}" -p"${DB_PASSWORD}" "${DB_DATABASE}" < /var/www/html/humicpro_aigo.sql echo "Import complete." fi