home/container-images
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: home:02dea6fe5c9fbdfe6a4ba43f0b972116ffd16c0d
Branches Tags
home:master
...
compare: home:2cf5ef343b6080409df321c673c9fce447f3fbc5
Branches Tags
home:master

2 commits
02dea6fe5c ... 2cf5ef343b

Author SHA1 Message Date
Pim Kunis
2cf5ef343b Login into container registry using Skopeo
Some checks failed
/ push (push) Failing after 1m19s
Details 
Remove experimental feature flags
Bump forgejo-nix-action image version
 2024-04-28 20:26:21 +02:00
Pim Kunis
687d16c49e Replace Docker with Skopeo 2024-04-28 20:18:23 +02:00
2 changed files with 13 additions and 15 deletions
Show stats Expand all files Collapse all files

13
.forgejo/workflows/cache.yaml
View file

@ -3,7 +3,7 @@ jobs:
push: push:
runs-on: docker runs-on: docker
container: container:
image: git.kun.is/home/forgejo-nix-action:9b44b726c0b6eadc2e3006ec1fa1338a1a2e79f0 image: git.kun.is/home/forgejo-nix-action:687d16c49ea7936068bac64ec68c480a9d681962
steps: steps:
- name: Clone repository - name: Clone repository
run: git clone https://git.kun.is/home/container-images.git checkout run: git clone https://git.kun.is/home/container-images.git checkout
@ -12,18 +12,19 @@ jobs:
/bin/attic login local https://attic.kun.is ${{ secrets.ATTIC_TOKEN }} /bin/attic login local https://attic.kun.is ${{ secrets.ATTIC_TOKEN }}
/bin/attic use home /bin/attic use home
- name: Log into container registry - name: Log into container registry
run: echo -n "${{ secrets.RUNNER_TOKEN }}" | /bin/docker login https://git.kun.is --username pim --password-stdin # run: echo -n "${{ secrets.RUNNER_TOKEN }}" | /bin/docker login https://git.kun.is --username pim --password-stdin
run: /bin/skopeo login --username pim --password ${{ secrets.RUNNER_TOKEN }} https://git.kun.is
- name: Build Pim's blog - name: Build Pim's blog
run: nix build --extra-experimental-features nix-command --extra-experimental-features flakes --out-link blog-pim ./checkout#packages.x86_64-linux.blog-pim run: nix build --out-link blog-pim ./checkout#packages.x86_64-linux.blog-pim
- name: Push Pim's blog to Nix cache - name: Push Pim's blog to Nix cache
run: /bin/attic push home blog-pim run: /bin/attic push home blog-pim
- name: Push Pim's blog to container registry - name: Push Pim's blog to container registry
run: nix --extra-experimental-features "nix-command flakes" run ./checkout#packages.x86_64-linux.release ./checkout#packages.x86_64-linux.blog-pim blog-pim ./checkout run: nix run ./checkout#packages.x86_64-linux.release ./checkout#packages.x86_64-linux.blog-pim blog-pim ./checkout
- name: Build forgejo-nix-action - name: Build forgejo-nix-action
run: nix build --extra-experimental-features nix-command --extra-experimental-features flakes --no-allow-dirty --out-link forgejo-nix-action ./checkout#packages.x86_64-linux.forgejo-nix-action run: nix build --no-allow-dirty --out-link forgejo-nix-action ./checkout#packages.x86_64-linux.forgejo-nix-action
- name: Push forgjeo-nix-action to Nix cache - name: Push forgjeo-nix-action to Nix cache
run: /bin/attic push home forgejo-nix-action run: /bin/attic push home forgejo-nix-action
- name: Build Atticd - name: Build Atticd
run: nix build --extra-experimental-features nix-command --extra-experimental-features flakes --no-allow-dirty --out-link atticd ./checkout#packages.x86_64-linux.atticd run: nix build --no-allow-dirty --out-link atticd ./checkout#packages.x86_64-linux.atticd
- name: Push atticd to Nix cache - name: Push atticd to Nix cache
run: /bin/attic push home atticd run: /bin/attic push home atticd

15
forgejo-nix-action.nix
View file

@ -20,7 +20,9 @@ let
nixConfDrv = pkgs.stdenv.mkDerivation { nixConfDrv = pkgs.stdenv.mkDerivation {
name = "nix.conf"; name = "nix.conf";
dontUnpack = true; dontUnpack = true;
installPhase = "install -Dm755 ${nixConf} $out/etc/nix/nix.conf"; installPhase = ''
install -Dm755 ${nixConf} $out/etc/nix/nix.conf
'';
}; };
in in
{ {
@ -31,14 +33,9 @@ in
copyToRoot = pkgs.buildEnv { copyToRoot = pkgs.buildEnv {
name = "image-root"; name = "image-root";
paths = with pkgs; [ coreutils attic-client docker-client nixConfDrv ]; # TODO: Maybe we don't even want these binaries in the base image, but run everything through nix-run?
pathsToLink = [ "/bin" "/etc/nix" ]; paths = with pkgs; [ coreutils attic-client skopeo nixConfDrv ];
pathsToLink = [ "/bin" "/etc" ];
}; };
# config = {
# Env = [
# "PATH=/bin:/root/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin"
# ];
# };
}; };
}) })