fix(docker): support Windows line endings and set port 8080/3307 to avoid Laragon conflicts
This commit is contained in:
+2
-1
@@ -60,7 +60,8 @@ COPY docker/php/opcache.ini /usr/local/etc/php/conf.d/opcache.ini
|
||||
|
||||
# Copy entrypoint script
|
||||
COPY docker/entrypoint.sh /usr/local/bin/docker-entrypoint.sh
|
||||
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
|
||||
RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh \
|
||||
&& chmod +x /usr/local/bin/docker-entrypoint.sh
|
||||
|
||||
# Copy application source code
|
||||
COPY . /var/www
|
||||
|
||||
+3
-2
@@ -11,6 +11,7 @@ services:
|
||||
environment:
|
||||
APP_ENV: ${APP_ENV:-production}
|
||||
APP_DEBUG: ${APP_DEBUG:-false}
|
||||
APP_KEY: ${APP_KEY:-base64:NWlKroSb+Fq5B7heJwGi/Irk7TDeUdOB3bYz4twwMfU=}
|
||||
DB_CONNECTION: mysql
|
||||
DB_HOST: db
|
||||
DB_PORT: 3306
|
||||
@@ -35,7 +36,7 @@ services:
|
||||
image: nginx:alpine
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "${APP_PORT:-80}:80"
|
||||
- "${APP_PORT:-8080}:80"
|
||||
volumes:
|
||||
- ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
|
||||
- .:/var/www:ro
|
||||
@@ -59,7 +60,7 @@ services:
|
||||
MYSQL_PASSWORD: ${DB_PASSWORD:-rkm_secret_password}
|
||||
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD:-root_secret_password}
|
||||
ports:
|
||||
- "${FORWARD_DB_PORT:-3306}:3306"
|
||||
- "${FORWARD_DB_PORT:-3307}:3306"
|
||||
volumes:
|
||||
- rkm_mysql_data:/var/lib/mysql
|
||||
healthcheck:
|
||||
|
||||
Reference in New Issue
Block a user