fablab-nea/labsync
1
0
Fork 0
Code Issues 11 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge branch 'bookworm' into 'main'

Browse source 
Debian bookworm

See merge request fablab/labsync!75
This commit is contained in:
jalr 2023-03-03 01:04:50 +00:00
commit 1dd450e0ee
8 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -74,7 +74,7 @@ security_scanner:
services: services:
- docker:dind - docker:dind
script: script:
- scripts/packer.sh debian-bullseye - scripts/packer.sh debian-bookworm
- aws --endpoint-url "$AWS_ENDPOINT_URL" s3 cp images/ "s3://$AWS_BUCKET/$CI_COMMIT_REF_SLUG/$CI_JOB_ID/" --recursive --no-progress - aws --endpoint-url "$AWS_ENDPOINT_URL" s3 cp images/ "s3://$AWS_BUCKET/$CI_COMMIT_REF_SLUG/$CI_JOB_ID/" --recursive --no-progress
artifacts: artifacts:
paths: paths:

30
Makefile
View file

@ -22,7 +22,7 @@ qemu_network = 10.2.2.0
qemu_netmask = 24 qemu_netmask = 24
qemu_vm_ip = 10.2.2.10 qemu_vm_ip = 10.2.2.10
qemu_disk = tmp/qemu-disk.img qemu_disk = tmp/qemu-disk.img
qemu_target ?= debian-bullseye qemu_target ?= debian-bookworm
qemu_kernel = $(qemu_target).linux qemu_kernel = $(qemu_target).linux
qemu_torrent = $(qemu_target).torrent qemu_torrent = $(qemu_target).torrent
qemu_initramfs = $(shell \ qemu_initramfs = $(shell \
@ -35,7 +35,7 @@ fi \
ci_environment=$(shell env | sed -n 's/^\(CI_.*\)=.*/-e \1/p') ci_environment=$(shell env | sed -n 's/^\(CI_.*\)=.*/-e \1/p')
.PHONY: default .PHONY: default
default: builderimg images/debian-bullseye.squashfs default: builderimg images/debian-bookworm.squashfs
.PHONY: clean .PHONY: clean
clean: clean:
@ -60,7 +60,7 @@ images:
[ ! -d "$@" ] && mkdir "$@" [ ! -d "$@" ] && mkdir "$@"
touch "$@" touch "$@"
images/debian-bullseye.squashfs: images images/debian-bookworm.squashfs: images
docker run \ docker run \
--rm \ --rm \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
@ -72,9 +72,9 @@ images/debian-bullseye.squashfs: images
$(ci_environment) \ $(ci_environment) \
"$(DOCKER_IMAGE_BUILDER)" \ "$(DOCKER_IMAGE_BUILDER)" \
scripts/packer.sh \ scripts/packer.sh \
debian-bullseye debian-bookworm
images/debian-bullseye.torrent: images images/debian-bookworm.torrent: images
docker run \ docker run \
--rm \ --rm \
-v "${PWD}:${PWD}" \ -v "${PWD}:${PWD}" \
@ -82,7 +82,7 @@ images/debian-bullseye.torrent: images
-e "WEBSEED=$(WEBSEED)" \ -e "WEBSEED=$(WEBSEED)" \
"$(DOCKER_IMAGE_BUILDER)" \ "$(DOCKER_IMAGE_BUILDER)" \
scripts/torrent.sh \ scripts/torrent.sh \
debian-bullseye debian-bookworm
.PHONY: ansible .PHONY: ansible
ansible: ansible:
@ -104,24 +104,24 @@ ansible:
# updates the initramfs # updates the initramfs
# only used for development # only used for development
images/debian-bullseye.initramfs.dev: tmp/initramfs-extracted/debian-bullseye packer/initramfs/labsync images/debian-bookworm.initramfs.dev: tmp/initramfs-extracted/debian-bookworm packer/initramfs/labsync
cp packer/initramfs/labsync tmp/initramfs-extracted/debian-bullseye/scripts/labsync cp packer/initramfs/labsync tmp/initramfs-extracted/debian-bookworm/scripts/labsync
(cd tmp/initramfs-extracted/debian-bullseye && find . | cpio -H newc -o | gzip > $(CWD)/images/debian-bullseye.initramfs.dev) (cd tmp/initramfs-extracted/debian-bookworm && find . | cpio -H newc -o | gzip > $(CWD)/images/debian-bookworm.initramfs.dev)
tmp: tmp:
[ ! -d "$@" ] && mkdir "$@" || true [ ! -d "$@" ] && mkdir "$@" || true
tmp/initramfs-extracted/debian-bullseye: images/debian-bullseye.initramfs tmp/initramfs-extracted/debian-bookworm: images/debian-bookworm.initramfs
rm -rf tmp/initramfs-extracted/debian-bullseye rm -rf tmp/initramfs-extracted/debian-bookworm
mkdir -p tmp/initramfs-extracted/debian-bullseye mkdir -p tmp/initramfs-extracted/debian-bookworm
(cd tmp/initramfs-extracted/debian-bullseye && zcat "$(CWD)/images/debian-bullseye.initramfs" | cpio -i) (cd tmp/initramfs-extracted/debian-bookworm && zcat "$(CWD)/images/debian-bookworm.initramfs" | cpio -i)
touch tmp/initramfs-extracted/debian-bullseye touch tmp/initramfs-extracted/debian-bookworm
$(qemu_disk): tmp $(qemu_disk): tmp
qemu-img create "$@" 20G qemu-img create "$@" 20G
tmp/netboot.tar.gz: tmp tmp/netboot.tar.gz: tmp
wget -c -O "$@" https://cdn-aws.deb.debian.org/debian/dists/bullseye/main/installer-amd64/current/images/netboot/netboot.tar.gz wget -c -O "$@" https://cdn-aws.deb.debian.org/debian/dists/bookworm/main/installer-amd64/current/images/netboot/netboot.tar.gz
touch "$@" touch "$@"
tmp/tftproot: tmp/netboot.tar.gz tmp/tftproot: tmp/netboot.tar.gz

4
packer/ansible/playbook.yml
View file

@ -94,15 +94,13 @@
- de - de
extensions: extensions:
- uBlock0@raymondhill.net - uBlock0@raymondhill.net
- https-everywhere@eff.org
debian_sections: debian_sections:
- main - main
- contrib - contrib
- non-free - non-free
debian_mirror: http://ftp.de.debian.org/debian debian_mirror: http://ftp.de.debian.org/debian
hardware: hardware:
firmware: firmware: []
- firmware-amd-graphics
greeting: greeting:
title: Willkommen im FabLab Bad Windsheim title: Willkommen im FabLab Bad Windsheim
content: > content: >

2
packer/ansible/roles/firefox/files/policies.json
View file

@ -19,7 +19,7 @@
"NoDefaultBookmarks": true, "NoDefaultBookmarks": true,
"OfferToSaveLogins": true, "OfferToSaveLogins": true,
"Homepage": { "Homepage": {
"URL": "about:blank" "URL": "https://wiki.fablab-nea.de/"
}, },
"OverrideFirstRunPage": "", "OverrideFirstRunPage": "",
"SearchEngines": { "SearchEngines": {

6
packer/ansible/roles/fonts/tasks/main.yml
View file

@ -3,5 +3,11 @@
- import_tasks: google.yml - import_tasks: google.yml
tags: tags:
- fonts:google - fonts:google
- name: Install font viewer
apt:
name:
- fontmatrix
tags:
- fonts:fontmatrix
tags: tags:
- fonts - fonts

4
packer/debian-bullseye.yaml → packer/debian-bookworm.yaml
View file

@ -20,7 +20,7 @@ variables:
builders: builders:
- discard: true - discard: true
image: debian:bullseye image: debian:bookworm
type: docker type: docker
volumes: volumes:
'{{user `images`}}': /tmp/images '{{user `images`}}': /tmp/images
@ -62,7 +62,7 @@ provisioners:
- cp $(find /boot/ -name 'vmlinuz-*' | sort -V | tail -n 1) '/tmp/images/{{user `linux_file`}}' - cp $(find /boot/ -name 'vmlinuz-*' | sort -V | tail -n 1) '/tmp/images/{{user `linux_file`}}'
type: shell type: shell
- inline: - inline:
- apt-get -y install openssh-server python lsb-release - apt-get -y install openssh-server python3 lsb-release
type: shell type: shell
- playbook_file: ansible/playbook.yml - playbook_file: ansible/playbook.yml
type: ansible type: ansible

2
security-scanner/Dockerfile
View file

@ -1,4 +1,4 @@
FROM debian:bullseye-slim FROM debian:bookworm-slim
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install \ && apt-get -y install \

4
txt.cfg
View file

@ -1,7 +1,7 @@
label labsync label labsync
menu label ^labsync menu label ^labsync
kernel images/debian-bullseye.linux kernel images/debian-bookworm.linux
append initrd=images/debian-bullseye.initramfs.dev boot=labsync labsync_disk=sda labsync_partsize_boot=512 labsync_torrent=http://10.2.2.1/debian-bullseye.torrent quiet vga=792 ip=10.2.2.10:::255.255.255.0:qemu-host:ens3:off labsync_wait=pause append initrd=images/debian-bookworm.initramfs.dev boot=labsync labsync_disk=sda labsync_partsize_boot=512 labsync_torrent=http://10.2.2.1/debian-bookworm.torrent quiet vga=792 ip=10.2.2.10:::255.255.255.0:qemu-host:ens3:off labsync_wait=pause
label install label install
menu label ^Install menu label ^Install