Merge pull request #1 from dappface/feature/github-actions

Setup GitHub Actions

Author: Luke Sugiura

.github/workflows/deploy.yml

@@ -1,19 +1,19 @@
-# name: Deploy
+name: Deploy
 
-# on:
-#   push:
-#   release:
-#     types: [published]
+on:
+  push:
+  release:
+    types: [published]
 
-# jobs:
-#   build-and-deploy:
-#     runs-on: ubuntu-18.04
-#     steps:
-#       - name: Checkout source code
-#         uses: actions/checkout@v1
-#       - name: Authenticate to Google Cloud
-#         run: |
-#           echo ${{ secrets.GOOGLE_CLOUD_KEY }} | base64 --decode > "$HOME"/google-cloud-key.json
-#           gcloud auth activate-service-account --key-file="$HOME"/google-cloud-key.json
-#       - name: Deploy to Cloud Run
-#         run: bin/deploy.sh
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v1
+      - name: Authenticate to Google Cloud
+        run: |
+          echo ${{ secrets.GOOGLE_CLOUD_KEY }} | base64 --decode > "$HOME"/google-cloud-key.json
+          gcloud auth activate-service-account --key-file="$HOME"/google-cloud-key.json
+      - name: Deploy to Cloud Run
+        run: bin/deploy.sh

Dockerfile

@@ -12,5 +12,6 @@ RUN apk --update --no-cache add ca-certificates && \
   update-ca-certificates && \
   sed -i "s/__SUBDOMAIN__/$SUBDOMAIN/g" /etc/nginx/conf.d/nginx.conf && \
   sed -i "s/__CLOUD_RUN_ID__/$CLOUD_RUN_ID/g" /etc/nginx/conf.d/nginx.conf
+ENV PORT 8080
 
 ENTRYPOINT ["./start.sh"]

README.md

@@ -21,7 +21,7 @@ docker build -t dappface-api <path-to-api-project>
 docker run --name dappface-api --rm -p 8080:8080 -e PROJECT_ID=$PROJECT_ID -e HOME=$HOME -v $HOME:$HOME dappface-api
 
 docker build \
-  --build-arg SUBDOMAIN=$SUBDOMAIN \
+  --build-arg SUBDOMAIN="$SUBDOMAIN" \
   --build-arg CLOUD_RUN_ID="$CLOUD_RUN_ID" \
   -t dappface-api-proxy .
 docker run -it --rm -p 80:80 --link dappface-api:dappface-api dappface-api-proxy

bin/deploy.sh

@@ -23,7 +23,7 @@ IMAGE_SRC_PATH=gcr.io/"$PROJECT_ID"/"$APP_NAME"
 gcloud auth configure-docker
 docker build \
   --build-arg SUBDOMAIN="$SUBDOMAIN" \
-  --build-arg CLOUD_RUN_ID="$CLOUD_RUN_ID"
+  --build-arg CLOUD_RUN_ID="$CLOUD_RUN_ID" \
   -t "$IMAGE_SRC_PATH":latest \
   -t "$IMAGE_SRC_PATH":"$GITHUB_SHA" .
 docker push "$IMAGE_SRC_PATH":latest

nginx.conf

@@ -1,24 +1,19 @@
 server {
-  listen 80 default_server;
-  return 200;
-}
-
-server {
-  listen 80;
+  listen 8080;
   server_name __SUBDOMAIN__.dappface.com;
 
   location /query {
-    proxy_pass https://api-go-__CLOUD_RUN_ID__-ue.a.run.app:80/query;
+    proxy_pass https://api-go-__CLOUD_RUN_ID__-ue.a.run.app/query;
     proxy_read_timeout 900;
   }
 
   location /contact {
-    proxy_pass https://api-rust-__CLOUD_RUN_ID__-ue.a.run.app:80/contact;
+    proxy_pass https://api-rust-__CLOUD_RUN_ID__-ue.a.run.app/contact;
     proxy_read_timeout 900;
   }
 
   location / {
-    proxy_pass https://api-go-__CLOUD_RUN_ID__-ue.a.run.app:80;
+    proxy_pass https://api-go-__CLOUD_RUN_ID__-ue.a.run.app;
     proxy_read_timeout 900;
   }
 }