From c7798ac5e4e567556197775e8e698c9a08f4e76d Mon Sep 17 00:00:00 2001
From: aprilthepink <aprl@acab.dev>
Date: Fri, 17 May 2024 11:06:16 +0200
Subject: [PATCH] fix: docker build

---
 .github/workflows/docker-publish.yml | 26 ++++++++++----------------
 flake.nix                            |  3 ++-
 src/main.rs                          |  4 ++--
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 0203c2a..149af86 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -5,8 +5,6 @@ on:
     branches: [ "main" ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
-  pull_request:
-    branches: [ "main" ]
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -51,17 +49,13 @@ jobs:
         uses: docker/metadata-action@v5 # v5.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v5 # v5.0.0
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          provenance: mode=max
-          sbom: true
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: DeterminateSystems/flake-checker-action@main
+      - name: Build docker package
+        run: nix build .#ociImage
+      - name: Load Docker image
+        run: docker load < result
+      - name: Push image to registry
+        if: github.event_name != 'pull_request'
+        run: docker push ghcr.io/$IMAGE_NAME -a
diff --git a/flake.nix b/flake.nix
index d40a6bb..0d9b560 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,7 +79,8 @@
           };
           packages.ociImage = pkgs.dockerTools.buildLayeredImage
             {
-              name = "lysand-ap-layer";
+              name = "ghcr.io/lysand-org/activitypub";
+              tag = "main";
               contents = [
                 config.packages.lysand-ap-layer
                 config.packages.ls-ap-migration
diff --git a/src/main.rs b/src/main.rs
index 953308c..bee75c8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -150,8 +150,8 @@ async fn main() -> actix_web::Result<(), anyhow::Error> {
     env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
 
     //TODO remove this
-    lysand::test::main().await?;
-    return Ok(());
+    //lysand::test::main().await?;
+    //return Ok(());
 
     let ap_id = Url::parse(&format!(
         "https://{}/{}",