add zstd tools to the base flake actions image to be able to run standard nix community actions

This commit is contained in:
Cyryl Płotnicki 2024-04-27 12:32:51 +01:00
parent 96f5f85a20
commit 09fcbbb6ee
2 changed files with 86 additions and 85 deletions

View file

@ -1,6 +1,8 @@
* `nix build '.#flakes-action' #for default platform * `nix build '.#flakes-action' #for default platform
* nix build '#packages.aarch64-linux.flakes-action' #for specific platform * nix build '#packages.aarch64-linux.flakes-action' #for specific platform
* `docker load < result` *
* `docker tag [image id] git.cyplo.dev/cyplo/base-images/flakes-action:latest` ```
* `docker push git.cyplo.dev/cyplo/base-images/flakes-action:latest` export BASE_IMAGE_DOCKER_TAG=`docker load < result | grep -i 'loaded image' | cut -f3 -d ' '`
docker tag $BASE_IMAGE_DOCKER_TAG git.cyplo.dev/cyplo/base-images/flakes-action:latest
docker push git.cyplo.dev/cyplo/base-images/flakes-action:latest
```

View file

@ -6,16 +6,17 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = { self, nixpkgs, flake-utils }: outputs = {
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem flake-utils.lib.eachDefaultSystem
(system: (system: let
let
pkgs = import nixpkgs {inherit system;}; pkgs = import nixpkgs {inherit system;};
pkgsStatic = pkgs.pkgsStatic; pkgsStatic = pkgs.pkgsStatic;
lib = pkgs.lib; lib = pkgs.lib;
in {
in
{
packages = { packages = {
hello = pkgs.dockerTools.buildImage { hello = pkgs.dockerTools.buildImage {
name = "hello-docker"; name = "hello-docker";
@ -28,21 +29,22 @@
contents = with pkgs; [ contents = with pkgs; [
./root ./root
bash bash
cacert
coreutils coreutils
curl curl
gawk gawk
gitFull gitFull
git-lfs git-lfs
gnused gnused
nodejs
wget
sudo
nixFlakes
cacert
gnutar gnutar
gzip gzip
nixFlakes
nodejs
openssh openssh
sudo
wget
xz xz
zstd
(pkgs.writeTextFile { (pkgs.writeTextFile {
name = "nix.conf"; name = "nix.conf";
destination = "/etc/nix/nix.conf"; destination = "/etc/nix/nix.conf";
@ -82,14 +84,11 @@
}; };
devShells = { devShells = {
default = (pkgs.mkShell { default = pkgs.mkShell {
buildInputs = (with pkgs; buildInputs = with pkgs; [
[
git-lfs git-lfs
]); ];
};
});
}; };
}); });
} }