CI rework

Signed-off-by: Till Wegmueller <[email protected]>

.github/workflows/ci.yml

@@ -20,6 +20,8 @@ jobs:
       uses: metalbear-co/[email protected]
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Prisma generate
+      run: cargo prisma generate
     - name: Build
       run: cargo build --verbose
     - name: Run tests

.github/workflows/images.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        package: ["identd", "domainservd", "publisherd"]
+        package: ["blogd", "domainservd"]
     steps:
       -
         name: Checkout
@@ -28,9 +28,10 @@ jobs:
           password: ${{ github.token }}
       -
         name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
+          file: "${{ matrix.package }}.Dockerfile"
           push: true
           tags: ghcr.io/openflowlabs/oxifed/${{ matrix.package }}:${{  github.ref_name }}
           build-args: "PACKAGE=${{ matrix.package }}"

domainservd.Dockerfile

@@ -0,0 +1,19 @@
+FROM cgr.dev/chainguard/rust:latest-dev as build
+ARG PACKAGE
+USER root
+RUN apk update && apk add --no-cache --update-cache pkgconf openssl openssl-dev
+WORKDIR /app
+ADD . .
+RUN chown -R nonroot /app
+USER nonroot
+RUN cargo build --release --bin domainservd
+
+FROM cgr.dev/chainguard/wolfi-base
+ARG PACKAGE
+USER root
+#RUN adduser -D nonroot
+RUN apk update && apk add --no-cache --update-cache openssl libgcc
+USER nonroot
+COPY --from=build --chown=nonroot:nonroot /app/target/release/${PACKAGE} /usr/local/bin/${PACKAGE}
+ENV PACKAGE=${PACKAGE}
+ENTRYPOINT "/usr/local/bin/${PACKAGE}"

src/prisma.rs

@@ -1,7 +1,6 @@
 // Code generated by Prisma Client Rust. DO NOT EDIT
 
-pub static DATAMODEL_STR: &'static str =
-    include_str!("/export/home/toast/workspace/oxifed/prisma/schema.prisma");
+pub static DATAMODEL_STR: &'static str = include_str!("../prisma/schema.prisma");
 static DATABASE_STR: &'static str = "postgresql";
 pub async fn new_client() -> Result<PrismaClient, ::prisma_client_rust::NewClientError> {
     PrismaClient::_builder().build().await