fix website publish (#254)

* fix website push

* save

* install leptos

* blackberry

* massive restructuring

* got build to work

* keep trying

Author: darioalessandro

.github/workflows/upload-website-docker-hub.yaml

@@ -1,26 +1,28 @@
 name: Publish Website to Docker image
 
 on:
-  # pull_request:
-  #   paths:
-  #     - '*'
+  pull_request:
+    paths:
+      - 'leptos-website/**'
+      - 'docker/Dockerfile.website'
   push:
     branches:
       - main
     paths:
       - 'leptos-website/**'
-      - docker/Dockerfile.website
+      - 'docker/Dockerfile.website'
 
 jobs:
-  push_to_registry:
-    name: Push Website Docker image to Docker Hub
+  build_and_push:
+    name: Build and Push Website Docker image
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
         id: checkout
 
       - name: Log in to Docker Hub
+        if: github.event_name == 'push'
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -34,12 +36,12 @@ jobs:
         id: extract_branch
         run: echo "::set-output name=branch::${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
 
-      - name: Build and push  UI Docker image
+      - name: Build and push Website Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
-          context: ./leptos-website
+          context: .
           file: docker/Dockerfile.website
-          push: true
+          push: ${{ github.event_name == 'push' }}
           tags: |
             securityunion/video-call-rs-website:${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_sha.outputs.sha8 }}
             securityunion/video-call-rs-website:latest

docker/Dockerfile.website

@@ -11,20 +11,21 @@ RUN apt-get update && apt-get install -y \
 
 RUN cargo install cargo-leptos --version 0.2.20
 
-WORKDIR /app
+WORKDIR /app/leptos-website
 
-COPY . .
+COPY leptos-website .
 
+RUN cargo install -f wasm-bindgen-cli --version 0.2.93
 RUN cargo leptos build --release
 
 FROM debian:bookworm-slim
 
 # Copy the server binary to the /app directory
-COPY --from=builder /app/target/release/leptos_website /app/
+COPY --from=builder /app/leptos-website/target/release/leptos_website /app/
 # /target/site contains our JS/WASM/CSS, etc.
-COPY --from=builder /app/target/site /app/site
-# Copy Cargo.toml if it’s needed at runtime
-COPY --from=builder /app/Cargo.toml /app/
+COPY --from=builder /app/leptos-website/target/site /app/site
+# Copy Cargo.toml if it's needed at runtime
+COPY --from=builder /app/leptos-website/Cargo.toml /app/
 WORKDIR /app
 ENV RUST_LOG="info"
 ENV LEPTOS_SITE_ADDR="0.0.0.0:8080"

docker/Dockerfile.website.dev

@@ -9,7 +9,8 @@ RUN apt-get update && apt-get install -y \
     g++ \
     && rm -rf /var/lib/apt/lists/*
 
-RUN cargo install cargo-leptos --version 0.2.20
+RUN cargo install cargo-leptos --version 0.2.29
+RUN cargo install wasm-bindgen-cli --version 0.2.100
 
 RUN cargo install trunk --version 0.17.5
 

leptos-website/Cargo.toml

@@ -45,7 +45,7 @@ sqlx = { version = "0.6.2", features = [
 	"sqlite",
 ], optional = true }
 thiserror = "1.0.38"
-wasm-bindgen = "0.2.100"
+wasm-bindgen = "=0.2.93"
 femark = { version = "=0.1.3", optional = true }
 axum-extra = { version = "0.7.4", optional = true, features = ["cookie"] }
 web-sys = { version = "0.3", optional = true, features = [