🚀 Deploy: add deploy config files and github action, closes #56 (#67)

Deploy using https://fly.io and hopefully staying in the free tier. Contact @camerondurham for accessing dashboards and logs.

Verify with:

```bash
 curl --request POST \
  --url http://runner.fly.dev:10100/api/v1/run \
  --header 'Content-Type: application/json' \
  --data '{
        "source": "print('\''what is up my dudes'\'')",
        "language":"python3"
}'
```

Author: camerondurham

.devcontainer/Dockerfile

@@ -7,5 +7,5 @@ RUN apt-get update -y \
 && go install github.com/spf13/cobra/[email protected] \
 && go install github.com/golang/mock/[email protected]
 
-EXPOSE 8080
+EXPOSE 10100
 ENTRYPOINT ["/bin/bash"]

.devcontainer/devcontainer.json

@@ -7,6 +7,6 @@
 		"eamodio.gitlens"
 	],
 	"forwardPorts": [
-		8080
+		10100
 	]
 }

.github/workflows/flyctl-deploy.yml

@@ -0,0 +1,15 @@
+name: Fly Deploy
+on:
+  push:
+    branches:
+      - main
+env:
+  FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+jobs:
+  deploy:
+      name: Deploy app
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v2
+        - uses: superfly/flyctl-actions/setup-flyctl@master
+        - run: flyctl deploy --remote-only  --dockerfile docker/server-debian/Dockerfile

Makefile

@@ -16,12 +16,8 @@ all:
 	@echo ""
 	@echo "  run-api: run the API server"
 	@echo ""
-	@echo "  run-api-bg: run the API server in the background"
-	@echo ""
 	@echo "  run-mock: run the mock API server"
 	@echo ""
-	@echo "  run-mock-bg: run the mock API server in the background"
-	@echo ""
 	@echo "  kill-api: kill the API server"
 	@echo ""
 	@echo "  test: run all unit tests in the repo"
@@ -40,20 +36,16 @@ all:
 	@echo ""
 	@echo "  dkr-server: build and run server using Docker"
 	@echo ""
-	@echo "  dkr-dev: build and run runtime processor using Docker"
-	@echo ""
 	@echo "  dkr-stop-mock: stop and remove mock container"
 	@echo ""
 	@echo "  dkr-stop-server: stop and remove server container"
 	@echo ""
-	@echo "  dkr-stop-dev: stop and remove dev container"
-	@echo ""
 
 dkr-build-mock:
 	docker build -t ${MOCK_SERVER_NAME}:${VERSION} -f docker/mock-server/Dockerfile .
 
 dkr-mock: dkr-build-mock
-	docker run -d -p 8080:8080 --name ${MOCK_SERVER_NAME} ${MOCK_SERVER_NAME}:${VERSION}
+	docker run -d -p 10100:10100 --name ${MOCK_SERVER_NAME} ${MOCK_SERVER_NAME}:${VERSION}
 
 # retire this command since we will likely stick with debian server
 dkr-build-alpine:
@@ -66,10 +58,7 @@ dkr-build-dev:
 	docker build -t ${DEV_NAME}:${VERSION} -f .devcontainer/Dockerfile .
 
 dkr-server: dkr-build-server
-	docker run -d -p 8080:8080 -e DEBUG=1 --name ${SERVER_NAME} ${SERVER_NAME}:${VERSION}
-
-dkr-dev: dkr-build-dev
-	docker run -it -p 8080:8080 --rm -v ${PWD}:/runner --name ${DEV_NAME} ${DEV_NAME}:${VERSION}
+	docker run -d -p 10100:10100 -e DEBUG=1 --name ${SERVER_NAME} ${SERVER_NAME}:${VERSION}
 
 dkr-stop-mock:
 	docker stop ${MOCK_SERVER_NAME}
@@ -125,4 +114,4 @@ install-hooks:
 	cp ./hack/hooks/* .git/hooks/
 	@echo "done"
 
-.PHONY: build lint test
+.PHONY: build lint test

cli/runner/client/client.go

@@ -15,7 +15,7 @@ import (
 // TODO: fill in this client package as needed and create, use Client as needed in CLI commands
 
 const (
-	DEFAULT_URL   = "http://localhost:8080"
+	DEFAULT_URL   = "http://localhost:10100"
 	LANG_ENDPOINT = "/api/v1/languages"
 	RUN_ENDPOINT  = "/api/v1/run"
 )
@@ -62,19 +62,22 @@ func (c *Client) Run(r *api.RunRequest) (*api.RunResponse, error) {
 	// TODO: implement/refactor
 	source := r.Source
 
-	body := strings.NewReader(source)
+	reqBody := api.RunRequest{
+		Source: source,
+		Lang:   r.Lang,
+	}
+
+	jsonBody, err := json.Marshal(reqBody)
+	PanicCheck(err)
+
+	body := strings.NewReader(string(jsonBody))
+
 	req, err := http.NewRequest("POST", c.BaseUrl+RUN_ENDPOINT, body)
 	if err != nil {
 		return nil, err
 	}
 	req.Header.Add("Content-Type", "application/json")
 
-	cookie := http.Cookie{
-		Name:  "language",
-		Value: string(r.Lang),
-	}
-	req.AddCookie(&cookie)
-
 	resp, err := c.HttpClient.Do(req)
 	if err != nil {
 		return nil, err

docker/mock-server/Dockerfile

@@ -8,5 +8,5 @@ FROM golang:1.17.6-alpine3.15
 # FROM scratch
 WORKDIR /runner
 COPY --from=builder /runner/mock-server ./
-EXPOSE 8080
+EXPOSE 10100
 ENTRYPOINT ["/runner/mock-server"]

docker/server-alpine/Dockerfile

@@ -16,5 +16,5 @@ COPY --from=builder /runner/process /usr/bin
 COPY --from=builder /runner/runner-server ./
 # TODO: do this in the server
 RUN groupadd -g 1234 runner1 && useradd -u 1234 -g runner1 -d /tmp/runner1 runner1
-EXPOSE 8080
+EXPOSE 10100
 ENTRYPOINT ["/runner/runner-server"]

docker/server-debian/Dockerfile

@@ -14,5 +14,5 @@ COPY --from=builder /runner/runner-server ./
 COPY docker/server-debian/entrypoint.sh /runner/entrypoint.sh
 RUN apt-get update \
     && apt-get install -y python3
-EXPOSE 8080
+EXPOSE 10100
 ENTRYPOINT ["/runner/entrypoint.sh", "server"]

docker/server-debian/docker-compose.yml

@@ -0,0 +1,11 @@
+services:
+  backend:
+    build: 
+      dockerfile: docker/server-debian/Dockerfile
+      context: ../../
+    ports:
+      - 10100:10100
+    deploy:
+      mode: replicated
+      replicas: 1
+      endpoint_mode: dnsrr

fly.toml

@@ -0,0 +1,15 @@
+# fly.toml file generated for runner on 2022-04-09T18:03:25-07:00
+
+app = "runner"
+
+
+[env]
+  PORT = "10100"
+
+[[services]]
+  internal_port = 10100
+  protocol = "tcp"
+
+  [[services.ports]]
+    handlers = ["http"]
+    port = "10100"

hack/kill_server.sh

@@ -5,7 +5,7 @@ kports() {
     if [[ "$#" != "0" ]]; then
         ports="$1"
     else
-        ports="8080"
+        ports="10100"
     fi
 
     processes=$(lsof -i:"${ports}")

readme.md

@@ -162,7 +162,7 @@ make run-mock
 # run the mock API server in the background (you'll have to use `make kill-api` to shut down)
 make run-mock-bg
 
-# kill the server (mock or not) if it's running (this works by killing the process using port 8080, the API port)
+# kill the server (mock or not) if it's running (this works by killing the process using port 10100, the API port)
 make kill-api
 
 # run all tests in the repository
@@ -231,21 +231,21 @@ go run api/main.go
 ```
 
 Usually you'll want to run the server in the background to you can do other
-things with your terminal. However, you'd need to kill the process running on port `8080`
+things with your terminal. However, you'd need to kill the process running on port `10100`
 once you're done. You can use the `api/kill_server.sh` script for this.
 
 ```bash
 # 1. run the API in the background
 go run api/main.go &
 
-# 2. once you are done, use the script to shut down processes on port 8080
+# 2. once you are done, use the script to shut down processes on port 10100
 ./api/kill_server.sh
 
 ```
 
 You can also use the `api/kill_server.sh` script if you see this error:
 
-> error starting server: listen tcp :8080: bind: address already in use
+> error starting server: listen tcp :10100: bind: address already in use
 
 ### Go Tips
 

server/main.go

@@ -18,7 +18,7 @@ import (
 )
 
 const (
-	API_PORT               = ":8080"
+	API_PORT               = ":10100"
 	SERVER_REQUEST_TIMEOUT = 10
 )
 

server/mock-server/main.go

@@ -16,7 +16,7 @@ import (
 )
 
 const (
-	API_PORT               = ":8080"
+	API_PORT               = ":10100"
 	SERVER_REQUEST_TIMEOUT = 10
 )
 

server/test_server_startup.sh

@@ -12,7 +12,7 @@ sleep 5
 # child process process id
 server_pid=$!
 
-response=$(curl -X GET localhost:8080/api/v1/languages)
+response=$(curl -X GET localhost:10100/api/v1/languages)
 if [ -z "$response" ]; then
     echo "no response from languages endpoint"
     kill -9 $server_pid