forked from github-mirror/docker-nixpkgs
Compare commits
1 Commits
nix-unstab
...
pjjw/gitea
| Author | SHA1 | Date | |
|---|---|---|---|
| 617b5494c1 |
5
.github/workflows/nix.yml
vendored
5
.github/workflows/nix.yml
vendored
@@ -18,11 +18,12 @@ jobs:
|
||||
- nixos-unstable
|
||||
- nixos-22.11
|
||||
- nixos-23.05
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: native
|
||||
container: pjjw/nix-flake-runner:1
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v22
|
||||
- run: nix-shell --run ./ci.sh
|
||||
env:
|
||||
CI_PROJECT_PATH: pjjw
|
||||
CI_REGISTRY_AUTH: '${{ secrets.REGISTRY_AUTH }}'
|
||||
NIXPKGS_CHANNEL: '${{ matrix.channel }}'
|
||||
|
||||
@@ -6,20 +6,21 @@
|
||||
, python3
|
||||
, removeReferencesTo
|
||||
, runCommand
|
||||
, buildPackages
|
||||
}:
|
||||
let
|
||||
inherit (pkgsStatic)
|
||||
bashInteractive
|
||||
busybox
|
||||
cacert;
|
||||
cacert
|
||||
openssl
|
||||
;
|
||||
|
||||
bash = bashInteractive;
|
||||
|
||||
# Get nix from Hydra because the nixpkgs one is not fully static
|
||||
nixStaticBin = fetchurl {
|
||||
url = "https://hydra.nixos.org/build/228458395/download/1/nix";
|
||||
hash = "sha256-H361lUdMpBpBVwInBmpAXKAwjPIf740Jg9Nht0NV66s=";
|
||||
url = "https://hydra.nixos.org/build/181573550/download/1/nix";
|
||||
hash = "sha256-zO2xJhQIrLtL/ReTlcorjwsaTO1W5Rnr+sXwcLcujok=";
|
||||
};
|
||||
|
||||
nixSymlinks = [
|
||||
@@ -63,11 +64,6 @@ let
|
||||
# Add user home folder
|
||||
mkdir home
|
||||
|
||||
# Create an unpriveleged user that we can use also without the run-as-user.sh script
|
||||
chmod +w $PWD/etc/group $PWD/etc/passwd
|
||||
${buildPackages.shadow}/bin/groupadd --prefix $PWD -g 9000 nixuser
|
||||
${buildPackages.shadow}/bin/useradd --prefix $PWD -m -d /tmp -u 9000 -g 9000 -G nixuser nixuser
|
||||
|
||||
# Add SSL CA certs
|
||||
cp -a "${cacert}/etc/ssl/certs/ca-bundle.crt" etc/ssl/certs/ca-bundle.crt
|
||||
|
||||
@@ -121,8 +117,7 @@ let
|
||||
Env = [
|
||||
"NIX_BUILD_SHELL=/bin/bash"
|
||||
"PAGER=cat"
|
||||
# /host/bin can be used to extend the image with additional binaries
|
||||
"PATH=/bin:/host/bin"
|
||||
"PATH=/bin"
|
||||
"SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt"
|
||||
];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user