diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml new file mode 100644 index 0000000..f500cb0 --- /dev/null +++ b/.github/workflows/docker-publish.yml @@ -0,0 +1,91 @@ +name: Docker + +on: + push: + branches: [ "main" ] + # Publish semver tags as releases. + tags: [ 'v*.*.*' ] + pull_request: + branches: [ "main" ] + +env: + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # github.repository as / + IMAGE_NAME: ${{ github.repository }} + + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + # This is used to complete the identity challenge + # with sigstore/fulcio when running outside of PRs. + id-token: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Install the cosign tool except on PR + # https://github.com/sigstore/cosign-installer + - name: Install cosign + if: github.event_name != 'pull_request' + uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1 + with: + cosign-release: 'v2.1.1' + + # Set up BuildKit Docker container builder to be able to build + # multi-platform images and export cache + # https://github.com/docker/setup-buildx-action + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0 + + # Login against a Docker registry except on PR + # https://github.com/docker/login-action + - name: Log into registry ${{ env.REGISTRY }} + if: github.event_name != 'pull_request' + uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + # Extract metadata (tags, labels) for Docker + # https://github.com/docker/metadata-action + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + # Build and push Docker image with Buildx (don't push on PR) + # https://github.com/docker/build-push-action + - name: Build and push Docker image + id: build-and-push + uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0 + with: + context: . + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max + + # Sign the resulting Docker image digest except on PRs. + # This will only write to the public Rekor transparency log when the Docker + # repository is public to avoid leaking data. If you would like to publish + # transparency data even for private images, pass --force to cosign below. + # https://github.com/sigstore/cosign + - name: Sign the published Docker image + if: ${{ github.event_name != 'pull_request' }} + env: + # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable + TAGS: ${{ steps.meta.outputs.tags }} + DIGEST: ${{ steps.build-and-push.outputs.digest }} + # This step uses the identity token to provision an ephemeral certificate + # against the sigstore community Fulcio instance. + run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST} diff --git a/Caddyfile b/Caddyfile new file mode 100644 index 0000000..5b673fc --- /dev/null +++ b/Caddyfile @@ -0,0 +1,3 @@ +recipes.ingalless.com:80 { + reverse_proxy http://recipes:8000 +} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..53450de --- /dev/null +++ b/Dockerfile @@ -0,0 +1,27 @@ +FROM rust:1.76 as builder +WORKDIR /usr/src/no-nonsense-recipes +COPY . . +RUN cargo install --path . + +FROM debian:bookworm-slim + +ENV APP_RECIPES_PATH=/home/recipes +ENV APP_COMPILED_PATH=/home/compiled +ENV ROCKET_ADDRESS=0.0.0.0 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + ca-certificates \ + gcc \ + libc6-dev \ + pkg-config \ + libssl-dev \ + && rm -rf /var/lib/apt/lists/* +COPY --from=builder /usr/local/cargo/bin/no-nonsense-recipes /usr/local/bin/no-nonsense-recipes +COPY --from=builder /usr/src/no-nonsense-recipes/recipes /home/recipes +RUN mkdir /home/compiled + +EXPOSE 8000 +CMD ["no-nonsense-recipes"] + diff --git a/compose.yml b/compose.yml new file mode 100644 index 0000000..82be0ab --- /dev/null +++ b/compose.yml @@ -0,0 +1,33 @@ +version: "3.7" + +services: + recipes: + networks: + - backend + image: recipes + restart: unless-stopped + ports: + - "2016:8000" + caddy: + networks: + - backend + image: caddy:latest + restart: unless-stopped + cap_add: + - NET_ADMIN + ports: + - "80:80" + - "443:443" + - "443:443/udp" + volumes: + - $PWD/Caddyfile:/etc/caddy/Caddyfile + - caddy_data:/data + - caddy_config:/config + +volumes: + caddy_data: + external: true + caddy_config: + +networks: + backend: diff --git a/src/main.rs b/src/main.rs index 1b55810..f723a7f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,7 @@ -use std::{fs, path::PathBuf}; +use std::{ + fs, + path::{Path, PathBuf}, +}; use compiler::Compiler; use comrak::{markdown_to_html, Options}; @@ -30,8 +33,10 @@ impl Recipe { #[get("/recipe/")] fn read_recipe(recipe: &str) -> Result<(Status, (ContentType, String)), Status> { - let content = - fs::read_to_string(format!("./compiled/{}.html", recipe)).unwrap_or(String::from("")); + let compiled_path = std::env::var("APP_COMPILED_PATH").unwrap_or("./compiled".into()); + let recipe_file = format!("{}.html", recipe); + let path = Path::new(&compiled_path).join(recipe_file); + let content = fs::read_to_string(path).unwrap_or(String::from("")); Ok((Status::Ok, (ContentType::HTML, content))) } diff --git a/src/views.rs b/src/views.rs index c3e82f8..e1ff0c6 100644 --- a/src/views.rs +++ b/src/views.rs @@ -19,6 +19,7 @@ fn layout(rest: Markup) -> Markup { fn head() -> Markup { html! { head { + meta name="viewport" content="width=device-width, initial-scale=1" {} script src="https://cdn.tailwindcss.com?plugins=typography" {} } }