move Dockerfile on root

akirasosa · akirasosa · commit d30705efb4cc · 2016-12-09T16:41:16.000+07:00
diff --git a/Dockerfile b/Dockerfile
@@ -13,8 +13,8 @@ ADD dist /usr/share/nginx/html
 
 WORKDIR /tmp
 
-COPY index.html.erb .
-COPY render_template.rb .
+COPY docker/index.html.erb .
+COPY docker/render_template.rb .
 COPY dist/manifest.json .
 
 CMD ruby render_template.rb > /usr/share/nginx/html/index.html && \
diff --git a/docker/index.html.erb b/docker/index.html.erb
@@ -14,7 +14,7 @@
     <link href="<%= "#{ENV['ASSET_URL']}/#{@data['vendor.css']}" %>" rel="stylesheet"></head>
 <body>
 
-<mpt-app>test</mpt-app>
+<mpt-app></mpt-app>
 
 <!-- Google Analytics: change UA-74585747-1 to be your site's ID -->
 <script>
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -6,22 +6,15 @@ if [ ! -v AWS_SESSION_TOKEN ]; then
   source ./scripts/switch-role.sh
 fi
 
-
 yarn run build
 
-(
-cd docker
-
-cp -rfp ../dist .
-
 readonly DOCKER_NAME=micropost/frontend
 readonly AWS_ACCOUNT_NUMBER=$(aws sts get-caller-identity --output text --query 'Account')
 
 eval $(aws ecr get-login)
 docker build -t ${DOCKER_NAME} .
 docker tag ${DOCKER_NAME}:latest ${AWS_ACCOUNT_NUMBER}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${DOCKER_NAME}:latest
 docker push ${AWS_ACCOUNT_NUMBER}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${DOCKER_NAME}:latest
-)
 
 #aws sns publish --topic-arn "arn:aws:sns:${AWS_DEFAULT_REGION}:${AWS_ACCOUNT_NUMBER}:backend_app_updated" \
 #   --message "${ENV}: ${TRAVIS_COMMIT}"
