setup docker workflow

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build
+jame: Build
 on:
   push:
     branches:
@@ -33,7 +33,8 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         path: web-client/dist
-        name: app-${{ github.sha }}
+        name: app
+        retention-days: 3
 
   build-docs:
     name: Build Docs
@@ -58,7 +59,8 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         path: docs/src/.vitepress/dist
-        name: docs-${{ github.sha }}
+        name: docs
+        retention-days: 3
 
   build-server:
     name: Build Server
@@ -84,5 +86,6 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         path: target/x86_64-unknown-linux-musl/release/celerserver
-        name: celerserver-${{ github.sha }}
+        name: celerserver
+        retention-days: 3
 

.github/workflows/docker.yml

@@ -0,0 +1,32 @@
+name: Docker
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version tag of the image (e.g. 0.2.0-beta)"
+        required: true
+  pull_request:
+    branches:
+    - main
+
+jobs:
+  build-docker:
+    name: WIP Publish Docker Image
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: arduino/setup-task@v1
+      with:
+        version: 3.x
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: dawidd6/action-download-artifact@v2
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        workflow: build.yml
+        commit: a5dda8f40b034167ba31995f9a865dd2dfb1c138 #${{ github.sha }}
+        path: docker/dist
+    - uses: actions/upload-artifact@v3
+      with:
+        path: docker
+        name: docker
+        retention-days: 1

Taskfile.yml

@@ -35,6 +35,10 @@ includes:
     aliases: [themes, th]
     dir: ./web-themes
 
+  docker:
+    taskfile: ./docker
+    dir: ./docker
+
 tasks:
   install:
     desc: Install development dependencies and packages
@@ -67,34 +71,6 @@ tasks:
     cmds:
     - cargo fmt
 
-  docker:
-    deps: [build]
-    desc: Build docker container
-    cmds:
-    - task: docker:build
-
-  docker:build:
-    cmds:
-    - docker build -t pistonite/celer . --no-cache
-
-  docker:run:
-    desc: Run docker container
-    cmds:
-    - docker run -p 8000:80 pistonite/celer
-
-  docker:stop:
-    desc: Stop docker container
-    cmds:
-    - docker stop $(docker ps -q -a --filter ancestor=pistonite/celer)
-
-  docker:push:
-    desc: Push the container to docker hub. Takes in the tag [defaults to latest]
-    interactive: true
-    cmds:
-    - docker login
-    - docker push pistonite/celer:{{.CLI_ARGS | default "latest" }}
-    - docker logout
-
   build:
     desc: Build production assets
     deps:

compiler-core/src/util/site_origin.rs

@@ -14,3 +14,12 @@ pub fn get_site_origin() -> &'static str {
         None => "",
     }
 }
+
+/// Get the site domain (origin without url scheme)
+pub fn get_site_domain() -> &'static str {
+    let origin = get_site_origin();
+    match origin.strip_prefix("https://") {
+        Some(domain) => domain,
+        None => origin.strip_prefix("http://").unwrap_or(origin),
+    }
+}

docker/Dockerfile

@@ -0,0 +1,15 @@
+FROM alpine:latest
+EXPOSE 80
+ENV APP_DIR=/opt/app
+COPY ./dist $APP_DIR
+
+WORKDIR $APP_DIR
+
+ENV CELERSERVER_LOG=INFO \
+    CELERSERVER_ANSI=false \
+    CELERSERVER_PORT=80 \
+    CELERSERVER_DOCS_DIR=/opt/app/docs \
+    CELERSERVER_APP_DIR=/opt/app/app \
+    CELERSERVER_GZIP=true
+
+CMD ["./celerserver"]

docker/Taskfile.yml

@@ -10,3 +10,25 @@ tasks:
     - cp -r ../docs/src/.vitepress/dist/* dist/docs
     - cp -r ../web-client/dist/* dist/app
     - cp ../target/x86_64-unknown-linux-musl/release/celerserver dist
+
+  build:
+    desc: Build docker container locally (requires building assets first)
+    deps: [pull]
+    cmds:
+    - task: build-container
+      vars:
+        ARGS: --no-cache
+
+  build-container:
+    cmds:
+    - docker build -t ghcr.io/pistonite/celer . {{.ARGS}}
+
+  run:
+    desc: Run docker container
+    cmds:
+      - docker run -p 8000:80 ghcr.io/pistonite/celer -e CELERSERVER_SITE_ORIGIN=http://pistonite.local
+
+  stop:
+    desc: Stop docker container
+    cmds:
+    - docker stop $(docker ps -q -a --filter ancestor=ghcr.io/pistonite/celer)

docs/Taskfile.yml

@@ -19,7 +19,6 @@ tasks:
     deps: [txtpp]
     cmds:
     - npx vitepress build src > /dev/null 2> /dev/null
-    # - gzip src/.vitepress/dist/*.html src/.vitepress/dist/**/*.html src/.vitepress/dist/**/*.js src/.vitepress/dist/**/*.css -r -k -v
 
   check:
     desc: Check for issues in the docs

web-client/Taskfile.yml

@@ -21,7 +21,6 @@ tasks:
     - npx vite build
     - node tools/post-build.cjs
     - rm dist/index.html
-    # - gzip dist/*.html dist/**/*.js dist/**/*.css dist/**/*.wasm -k -v
 
   check:
     desc: Check for linting and formatting issues in web client

web-client/index.html

@@ -32,6 +32,7 @@
             content="Create your route with the web editor"
         />
         <!-- EDITOR -->
+        <script>window.__CELER_VERSION="0.0.0-dev unknown"</script>
     </head>
     <body>
         <div id="react-root">

web-server/Cargo.toml

@@ -21,6 +21,8 @@ tower = "0.4.13"
 tower-http = { version = "0.4.4", features = ["fs", "trace"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.17", features = ["ansi"] }
+flate2 = "1.0.27"
+once_cell = "1.18.0"
 
 [[bin]]
 name = "celerserver"

web-server/Taskfile.yml

@@ -13,5 +13,6 @@ tasks:
       CELERSERVER_HTTPS_CERT: ../cert/cert.pem
       CELERSERVER_HTTPS_KEY: ../cert/cert-key.pem
       CELERSERVER_SITE_ORIGIN: https://pistonite.local
+      CELERSERVER_GZIP: "true"
     cmds:
     - cargo watch -B 1 -s "cargo run --bin celerserver -- {{.CLI_ARGS}}"