Merge pull request #17 from LandvibeDev/fix/deployment

Reviewed by: @so3500 Close: #16
LandvibeDev · Aug 26, 2020 · 04e23e6 · 04e23e6
2 parents 83f843f + 57ca50c
commit 04e23e6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 99 deletions.
diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml
@@ -44,6 +44,6 @@ jobs:
         uses: aws-actions/amazon-ecs-deploy-task-definition@v1
         with:
           task-definition: ${{ steps.task-def.outputs.task-definition }}
-          service: ${{ secrets.AWS_ECS_GRADLE_SERVICE }}
+          service: ${{ secrets.AWS_ECS_NGINX_SERVICE }}
           cluster: ${{ secrets.AWS_ECS_CLUSTER }}
           wait-for-service-stability: true
diff --git a/.github/workflows/webchat.yml b/.github/workflows/webchat.yml
@@ -1,4 +1,4 @@
-name: Web-Chat
+name: webchat
 on:
   push:
     branches: [ master ]

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
@@ -2,5 +2,4 @@
 # docker run --name nginx -d -p 8080:80 -v front:/front:ro --link web-chat nginx
 FROM nginx
 
-COPY mime.types /etc/nginx/conf/mime.types
 COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/nginx/mime.types b/nginx/mime.types
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -33,6 +33,8 @@ http {
   root   /front;
   server {
     listen       80;
+    charset utf-8;
+
     location / {
       etag  on;
       if_modified_since before;