ci: add docker build action

.dockerignore

@@ -3,3 +3,4 @@ node_modules
 .moon/cache
 .moon/docker
 **/.env
+.git

.github/workflows/docker.yml

@@ -0,0 +1,61 @@
+name: Docker
+
+permissions:
+  contents: write
+  packages: write
+
+env:
+  REGISTRY: ghcr.io
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "*-?v[0-9]+*"
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            name=ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=pr
+            type=semver,pattern=v{{version}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{major}}
+            type=raw,value=unstable,enable={{is_default_branch}}
+
+      - name: Build and push to ghcr
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/release.yml

@@ -113,51 +113,11 @@ jobs:
         run: |
           gh release upload ${{ github.ref_name }} "tmp/script.ryot.zip"
 
-  docker-release:
-    runs-on: ubuntu-latest
-    needs: create-release
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get docker image name and build args
-        id: required_args
-        run: |
-          image_name="${{ env.REGISTRY }}/${{ github.actor }}/${{ github.event.repository.name }}"
-          image_names="$image_name:${{ github.ref_name }},$image_name:unstable"
-          if [ "${{ needs.create-release.outputs.is-prerelease }}" = "false" ]; then
-            image_names="$image_names,$image_name:latest"
-          fi
-          # lowercase the name
-          image_names=$(echo "$image_names" | tr '[:upper:]' '[:lower:]')
-          echo "image_names=$image_names" >> $GITHUB_OUTPUT
-
-      - name: Build and push to ghcr
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.required_args.outputs.image_names }}
-
   # Mark the Github Release™ as a non-draft now that everything has succeeded!
   publish-release:
     # Only run after all the other tasks, but it's ok if upload-artifacts was skipped
     needs:
-      [create-release, upload-artifacts, docker-release, upload-kodi-plugin]
+      [create-release, upload-artifacts, upload-kodi-plugin]
     if: ${{ always() && needs.create-release.result == 'success' && (needs.upload-artifacts.result == 'skipped' || needs.upload-artifacts.result == 'success') }}
     runs-on: ubuntu-latest
     env:

Cargo.toml

@@ -37,19 +37,3 @@ sea-orm-migration = "0.12.4"
 serde = { version = "1.0.189", features = ["derive"] }
 serde_json = "1.0.107"
 strum = { version = "0.25.0", features = ["derive"] }
-
-[workspace.metadata.dist]
-cargo-dist-version = "0.2.0"
-ci = ["github"]
-installers = ["shell", "powershell"]
-targets = [
-    "x86_64-unknown-linux-gnu",
-    "x86_64-apple-darwin",
-    "aarch64-apple-darwin",
-]
-
-[profile.dist]
-inherits = "release"
-opt-level = 's'
-strip = true
-lto = "thin"

Dockerfile

@@ -30,6 +30,7 @@ RUN cargo chef prepare --recipe-path recipe.json
 
 FROM chef AS app-builder
 ARG TARGETARCH
+ARG BUILD_PROFILE=release
 ENV RUST_TARGET_TRIPLE_arm64="aarch64-unknown-linux-gnu"
 ENV RUST_TARGET_TRIPLE_amd64="x86_64-unknown-linux-gnu"
 ENV TARGET_CC="clang"
@@ -38,7 +39,7 @@ ENV CFLAGS_aarch64_unknown_linux_gnu="--sysroot=/usr/aarch64-linux-gnu"
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
 COPY --from=planner /app/recipe.json recipe.json
 RUN rustup target add $(eval "echo \$RUST_TARGET_TRIPLE_$TARGETARCH")
-RUN cargo chef cook --profile dist --target $(eval "echo \$RUST_TARGET_TRIPLE_$TARGETARCH") --recipe-path recipe.json
+RUN cargo chef cook --profile $BUILD_PROFILE --target $(eval "echo \$RUST_TARGET_TRIPLE_$TARGETARCH") --recipe-path recipe.json
 COPY . .
 RUN ./apps/backend/ci/build-app.sh
 

apps/backend/ci/build-app.sh

@@ -5,5 +5,5 @@ set -euxo pipefail
 export RUST_TARGET_TRIPLE=$(eval "echo \$RUST_TARGET_TRIPLE_$TARGETARCH")
 
 rustup target add $RUST_TARGET_TRIPLE
-cargo build --profile dist --bin ryot --target ${RUST_TARGET_TRIPLE}
-cp -R /app/target/${RUST_TARGET_TRIPLE}/dist/ryot /app/ryot
+cargo build --profile ${BUILD_PROFILE} --bin ryot --target ${RUST_TARGET_TRIPLE}
+cp -R /app/target/${RUST_TARGET_TRIPLE}/${BUILD_PROFILE}/ryot /app/ryot