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 '#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,21 +6,22 @@
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
outputs = {
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = import nixpkgs { inherit system; };
(system: let
pkgs = import nixpkgs {inherit system;};
pkgsStatic = pkgs.pkgsStatic;
lib = pkgs.lib;
in
{
in {
packages = {
hello = pkgs.dockerTools.buildImage {
name = "hello-docker";
config = {
Cmd = [ "${pkgs.hello}/bin/hello" ];
Cmd = ["${pkgs.hello}/bin/hello"];
};
};
flakes-action = pkgs.dockerTools.buildImageWithNixDb {
@ -28,21 +29,22 @@
contents = with pkgs; [
./root
bash
cacert
coreutils
curl
gawk
gitFull
git-lfs
gnused
nodejs
wget
sudo
nixFlakes
cacert
gnutar
gzip
nixFlakes
nodejs
openssh
sudo
wget
xz
zstd
(pkgs.writeTextFile {
name = "nix.conf";
destination = "/etc/nix/nix.conf";
@ -65,7 +67,7 @@
mkdir -vp root
'';
config = {
Cmd = [ "/bin/bash" ];
Cmd = ["/bin/bash"];
Env = [
"LANG=en_GB.UTF-8"
"ENV=/etc/profile.d/nix.sh"
@ -82,14 +84,11 @@
};
devShells = {
default = (pkgs.mkShell {
buildInputs = (with pkgs;
[
default = pkgs.mkShell {
buildInputs = with pkgs; [
git-lfs
]);
});
];
};
};
});
}