diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 58b3f74..0b6bac0 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -16,16 +16,7 @@ jobs: with: name: trickypr authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: 'Login to GitHub Container Registry' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{github.actor}} - password: ${{secrets.GITHUB_TOKEN}} - run: nix build - - run: docker load < result - - run: docker push ghcr.io/anucssa/rubric-merge:latest - - run: nix build .#bin - uses: actions/upload-artifact@v4 with: path: ./result/bin/rubric-merge diff --git a/flake.nix b/flake.nix index 0207ab8..ae6bbaf 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,6 @@ let overlays = [ (import rust-overlay) ]; package = import ./nix/package.nix; - docker-image = import ./nix/docker-image.nix; pkgs = import nixpkgs { inherit system overlays; }; @@ -51,11 +50,7 @@ inherit pkgs; naersk = naersk'; }; - docker = docker-image { - inherit pkgs; - bin = bin; - }; - default = docker; + default = bin; }; devShells.default = diff --git a/nix/docker-image.nix b/nix/docker-image.nix deleted file mode 100644 index d889ffc..0000000 --- a/nix/docker-image.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, bin, ... }: -pkgs.dockerTools.buildImage { - name = "ghcr.io/anucssa/rubric-merge"; - tag = "latest"; - copyToRoot = [ bin ]; - config = { - Cmd = [ "${bin}/bin/rubric-merge" ]; - }; -}