Attempt to deploy in github actions

(like hell this is gonna work first time ...)

.github/workflows/deploy_website.yml

@@ -0,0 +1,43 @@
+name: deploy_language_referemce
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '.github/workflows/deploy_website.yml'
+      - 'teachprogramming/lib/**'
+      - 'teachprogramming/static/language_reference/**'
+
+jobs:
+
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+
+      - name: compile_and_run_languages
+        run: (cd teachprogramming/static/language_reference && make build_and_run)
+
+      - name: build_static
+        run: (cd teachprogramming/lib && make build_static)
+
+      - name: scp_api
+        uses: appleboy/scp-action@master
+        with:
+            host: computingteachers.uk
+            username: computingteachers
+            key: ${{ secrets.DEPLOY_SSH_KEY }}
+            source: "teachprogramming/lib/api/v1"
+            strip_components: 3
+            target: "computingteachers.uk/api"
+
+      - name: scp_static
+        uses: appleboy/scp-action@master
+        with:
+            host: computingteachers.uk
+            username: computingteachers
+            key: ${{ secrets.DEPLOY_SSH_KEY }}
+            source: "teachprogramming/lib/static"
+            strip_components: 2
+            target: "computingteachers.uk"

teachprogramming/lib/Makefile

@@ -1,17 +1,18 @@
 DOCKER_IMAGE:=site
-DOCKER_RUN:=docker run -it --rm \
+_DOCKER_RUN:=docker run --rm \
 	--workdir /app/ \
 	--volume ${PWD}:/app/ \
 	--volume ${PWD}/../static:/static/ \
 	--publish 8000:8000 \
-	--env PYTHONPATH=./ \
-	${DOCKER_IMAGE}
+	--env PYTHONPATH=./
+DOCKER_RUN:=${_DOCKER_RUN} -it ${DOCKER_IMAGE}
+DOCKER_RUN_no_tty:=${_DOCKER_RUN} ${DOCKER_IMAGE}
 
 serve_static: build_static
 	open http://localhost:8000/static/
 	python3 -m http.server
 build_static: build_docker
-	${DOCKER_RUN} python3 api.py /static/projects/ /static/language_reference/languages/ --export
+	${DOCKER_RUN_no_tty} python3 api.py /static/projects/ /static/language_reference/languages/ --export
 build_and_upload: build_static
 	scp -r ./api/v1 computingteachers.uk:computingteachers.uk/api
 	scp -r ./static computingteachers.uk:computingteachers.uk

teachprogramming/lib/api.py

@@ -83,7 +83,7 @@ def _filter_file(f):
 # Setup App -------------------------------------------------------------------
 
 def create_wsgi_app(project_path=None, language_path=None, **kwargs):
-    app = falcon.API()
+    app = falcon.App()
     app.add_route(r'/', IndexResource())
     app.add_static_route(r'/static', str(Path('static').resolve()))
     app.add_route(r'/api/v1/language_reference.json', LanguageReferenceResource(language_path))

teachprogramming/static/language_reference/Makefile

@@ -6,7 +6,7 @@ PATH_LANGAUGES := languages
 # Main -------------------------------------------------------------------------
 
 build_and_run:
-	docker-compose up --build
+	docker compose up --build
 
 assert_language_output:
 	python3 assert_language_output.py

teachprogramming/static/projects/tools/containers/README.md

@@ -35,7 +35,7 @@ Workshop
     * Write down the technical terms - consolidate as group
 7. Look at `docker-compose.yml`
     * Q: What is this file doing?
-8. Run `docker-compose up`
+8. Run `docker compose up`
     * visit `:8001` `:8002` `:8003` `:8004`
     * Look at the terminal log
     * Q: What is `docker-compose`?