From 8c80812442197a5da5ea78cb49cc45c912aca6e1 Mon Sep 17 00:00:00 2001 From: komtaki Date: Sat, 7 Aug 2021 14:48:57 +0900 Subject: [PATCH] fix: delete public docker volume for cache --- deployments/docker-compose.yml | 6 ------ deployments/etc/nginx/conf.d/default.conf | 6 +----- docker-compose.yml | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index 883abc256e..91f23ad0a0 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -7,7 +7,6 @@ services: - ./etc/nginx/nginx.conf:/etc/nginx/nginx.conf - ./etc/nginx/conf.d:/etc/nginx/conf.d - /var/log/nginx:/var/log/nginx - - static-public:/app/public environment: TZ: Asia/Tokyo ports: @@ -19,8 +18,6 @@ services: app: image: "{RepositoryName}" - volumes: - - static-public:/app/public environment: NEW_RELIC_APP_NAME: decidim-app({EBEnvironment}) env_file: @@ -33,6 +30,3 @@ services: NEW_RELIC_APP_NAME: decidim-sidekiq({EBEnvironment}) env_file: - .env - -volumes: - static-public: diff --git a/deployments/etc/nginx/conf.d/default.conf b/deployments/etc/nginx/conf.d/default.conf index 6eec6cb649..f3cf9e53a1 100644 --- a/deployments/etc/nginx/conf.d/default.conf +++ b/deployments/etc/nginx/conf.d/default.conf @@ -14,11 +14,7 @@ server { access_log /var/log/nginx/access.log main; access_log /var/log/nginx/healthd/application.log.$year-$month-$day-$hour healthd; - root /app/public; - - try_files $uri $uri @app; - - location @app { + location / { proxy_pass http://app:3000; proxy_http_version 1.1; proxy_set_header Connection $connection_upgrade; diff --git a/docker-compose.yml b/docker-compose.yml index 4850e20895..e46484f1e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,6 @@ services: volumes: - ./deployments/etc/nginx/nginx.conf:/etc/nginx/nginx.conf - ./deployments/etc/nginx/conf.d:/etc/nginx/conf.d - - ./public:/app/public environment: TZ: Asia/Tokyo ports: