Skip to content

Commit

Permalink
Replace isc-dhcp image with Guix System.
Browse files Browse the repository at this point in the history
  • Loading branch information
wigust committed Oct 15, 2024
1 parent c973de4 commit 9a9f90c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 128 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,13 @@ haproxy:
container=$$(guix pack -f docker --max-layers=100 -S /sbin=sbin haproxy)
skopeo copy --insecure-policy docker-archive\:$$container docker://$(container_registry)/library/$@:$$commit_8

container_registry=docker-registry.wugi.info
container_registry=harbor.home.wugi.info
.ONESHELL:
isc-dhcp:
set -o nounset -o errexit -o pipefail -o xtrace
commit_8=$$(git rev-parse HEAD | cut -c -8)
container=$$(guix pack -f docker --max-layers=100 -S /sbin=sbin isc-dhcp)
skopeo copy --insecure-policy docker-archive\:$$container docker://$(container_registry)/library/$@:$$commit_8
container=$$(guix system image --load-path=/home/oleg/.local/share/chezmoi/dotfiles/guixsd/modules --max-layers=100 -t docker --network dotfiles/guixsd/docker-image-isc-dhcp.scm)
skopeo copy docker-archive\:$$container docker://$(container_registry)/library/$@:$$commit_8

.PHONY: all
all: dotfiles/scripts/nix-ssh-known-hosts-to-file.scm
19 changes: 2 additions & 17 deletions infrastructure/base/isc-dhcp/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,5 @@ spec:
values:
- "true"
containers:
- image: docker-registry.wugi.info/library/isc-dhcp:5362faa6
name: dhcpd
command:
- /sbin/dhcpd
args:
- "-4" # version
- -cf
- /etc/dhcpd.conf
volumeMounts:
- mountPath: /etc/dhcpd.conf
subPath: dhcpd.conf
readOnly: true
name: config
volumes:
- name: config
configMap:
name: isc-dhcp-configuration
- image: harbor.home.wugi.info/library/isc-dhcp:7b1725c2
name: guix
4 changes: 0 additions & 4 deletions infrastructure/base/isc-dhcp/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@ namespace: isp-dhcp
resources:
- namespace.yaml
- daemonset.yaml
configMapGenerator:
- name: isc-dhcp-configuration
files:
- dhcpd.conf=rootfs/etc/dhcpd.conf
104 changes: 0 additions & 104 deletions infrastructure/base/isc-dhcp/rootfs/etc/dhcpd.conf

This file was deleted.

0 comments on commit 9a9f90c

Please sign in to comment.