tamipes/forgejo-actions
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Compare commits

base: tamipes:8436b99f189d6e23177a8eb02f0b685ac5894c2b
Branches Tags
tamipes:main
tamipes:pr-fix-actions-rebased
tamipes:pr-fix-actions-on-repo
tamipes:testing
..
compare: tamipes:f63d9ed7965064691c28d5ff14c7079d1056705d
Branches Tags
tamipes:main
tamipes:pr-fix-actions-rebased
tamipes:pr-fix-actions-on-repo
tamipes:testing

6 commits
8436b99f18 ... f63d9ed796

Author SHA1 Message Date
tamipes
f63d9ed796 Merge pull request 'Fixed nix-host container' (#2) from pr-fix-actions-rebased into main
All checks were successful
Build and Push docker image / buildAndPush (nix) (push) Successful in 2m20s
Details
Build and Push docker image / buildAndPush (nix-host) (push) Successful in 11s
Details 
Reviewed-on: #2
 2026-09-12 17:27:38 +02:00
Tamipes
4e83bf9761 feat: nix-host updates
All checks were successful
Build and Push docker image / buildAndPush (nix) (push) Successful in 2m24s
Details
Build and Push docker image / buildAndPush (nix-host) (push) Successful in 11s
Details 
- set up minimal fhs
- use root, things work with it
- add cache note
- correct ordering of `PATH`
 2026-09-12 17:02:10 +02:00
Tamipes
6c242c2a75 fix: rename the input nix to inputs.nix 2026-09-12 17:02:10 +02:00
Tamipes
7643d4f14a feat: add nix as a package to flake.nix so the matrix works 2026-09-12 17:02:10 +02:00
Tamipes
f1105d9ccb fix: forgot to add # in nix build .#$NAME 2026-09-12 17:01:23 +02:00
Tamipes
a3696b88fc feat: run build.yml on all branches 2026-09-12 16:55:02 +02:00
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/build.yml vendored
View file

@ -5,6 +5,7 @@ on:
push: push:
branches: branches:
- main - main
- "*"
jobs: jobs:
buildAndPush: buildAndPush:
@ -16,7 +17,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Nix build - name: Nix build
run: nix build --extra-experimental-features "flakes nix-command" .${{matrix.containers}} run: nix build --extra-experimental-features "flakes nix-command" .#${{matrix.containers}}
- name: Setup skopeo - name: Setup skopeo
run: curl -o /etc/containers/policy.json --create-dirs https://raw.githubusercontent.com/containers/skopeo/refs/heads/main/default-policy.json run: curl -o /etc/containers/policy.json --create-dirs https://raw.githubusercontent.com/containers/skopeo/refs/heads/main/default-policy.json
- name: Push Image - name: Push Image

27
flake.nix
View file

@ -8,7 +8,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { nixpkgs, nix, self, ... }@inputs: outputs = { nixpkgs, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
@ -17,8 +17,9 @@
{ {
packages.${system} = rec { packages.${system} = rec {
default = nix-with-tools; default = nix-with-tools;
nix = nix-with-tools;
minimal-nix = import (nix + "/docker.nix") { minimal-nix = import (inputs.nix + "/docker.nix") {
inherit pkgs; inherit pkgs;
extraPkgs = [ pkgs.nodejs pkgs.busybox ]; extraPkgs = [ pkgs.nodejs pkgs.busybox ];
@ -30,7 +31,7 @@
"org.opencontainers.image.description" = "Nix container image with nodejs"; "org.opencontainers.image.description" = "Nix container image with nodejs";
}; };
}; };
nix-with-tools = import (nix + "/docker.nix") { nix-with-tools = import (inputs.nix + "/docker.nix") {
inherit pkgs; inherit pkgs;
extraPkgs = [ extraPkgs = [
pkgs.nodejs pkgs.nodejs
@ -63,25 +64,29 @@
tag = "latest"; tag = "latest";
runAsRoot = '' runAsRoot = ''
${dockerTools.shadowSetup} mkdir /etc
useradd -m -s /run/current-system/sw/bin/bash docker-ci # ${pkgs.shadow}/bin/useradd -m -s /run/current-system/sw/bin/bash docker-ci
chmod 777 /tmp
mkdir -p /var/tmp
chmod 777 /var/tmp
''; '';
# volumes to mount # volumes to mount
# -v /nix:/nix:ro # -v /nix:/nix:ro
# -v /run/current-system:/run/current-system # -v /run/current-system:/run/current-system
# -v /var/cache/docker-ci:/.cache
# -v ${pkgs.buildEnv ... }:/run/container-env # -v ${pkgs.buildEnv ... }:/run/container-env
config = { config = {
Entrypoint = [ "/run/current-system/sw/bin/bash" ]; Entrypoint = [ "/run/current-system/sw/bin/bash" ];
User = "1000:1000"; # User = "1000:1000";
Env = [ Env = [
"NIX_REMOTE=daemon" "NIX_REMOTE=daemon"
"PATH=${lib.concatStringsSep ":" [ "PATH=${lib.concatStringsSep ":" [
"/run/current-system/sw/bin" "/run/container-env/bin"
"/run/current-system/sw/sbin" "/run/current-system/sw/bin"
"/run/container-env/bin" "/run/current-system/sw/sbin"
# "/run/container-env/sbin" # This might not be needed ]}"
]}"
"SSL_CERT_FILE=/run/current-system/etc/ssl/certs/ca-bundle.crt" "SSL_CERT_FILE=/run/current-system/etc/ssl/certs/ca-bundle.crt"
"GIT_SSL_CAINFO=/run/current-system/etc/ssl/certs/ca-bundle.crt" "GIT_SSL_CAINFO=/run/current-system/etc/ssl/certs/ca-bundle.crt"