Compare commits
	
		
			No commits in common. "6079a53c8aaeeedbf4b53f642473d0f67600016c" and "deb232aa0fd2fd8556305ad7f67893bb60781910" have entirely different histories.
		
	
	
		
			6079a53c8a
			...
			deb232aa0f
		
	
		
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -16,5 +16,3 @@ assets/win-pe/configs/*.xml
 | 
				
			|||||||
!/config/menus/
 | 
					!/config/menus/
 | 
				
			||||||
!/config/menus/windows.ipxe
 | 
					!/config/menus/windows.ipxe
 | 
				
			||||||
!/config/menus/menu.ipxe
 | 
					!/config/menus/menu.ipxe
 | 
				
			||||||
 | 
					 | 
				
			||||||
!/config/menus/vdi.ipxe
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -3,6 +3,6 @@ FROM ghcr.io/netbootxyz/netbootxyz
 | 
				
			|||||||
COPY smb.conf /etc/samba/smb.conf
 | 
					COPY smb.conf /etc/samba/smb.conf
 | 
				
			||||||
COPY samba.ini /etc/supervisor.d/samba.ini
 | 
					COPY samba.ini /etc/supervisor.d/samba.ini
 | 
				
			||||||
RUN apk add samba \
 | 
					RUN apk add samba \
 | 
				
			||||||
  && adduser -u 1010 -g 1010 isos --disabled-password \
 | 
					  && adduser isos --disabled-password \
 | 
				
			||||||
  && echo -e "isos\nisos" | smbpasswd -a -s -c /etc/samba/smb.conf isos
 | 
					  && echo -e "isos\nisos" | smbpasswd -a -s -c /etc/samba/smb.conf isos
 | 
				
			||||||
RUN cat /etc/supervisor.d/samba.ini >> /etc/supervisor.conf
 | 
					RUN cat /etc/supervisor.d/samba.ini >> /etc/supervisor.conf
 | 
				
			||||||
 | 
				
			|||||||
@ -1,33 +0,0 @@
 | 
				
			|||||||
#!ipxe
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# VDI
 | 
					 | 
				
			||||||
# Mostly copied from alpinelinux.ipxe
 | 
					 | 
				
			||||||
# Requires thinclient.apkovl.tar.gz to be setup and placed in /assets
 | 
					 | 
				
			||||||
# https://www.apalrd.net/posts/2022/alpine_vdiclient/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
set alpine_version v3.22
 | 
					 | 
				
			||||||
set os_arch ${arch}
 | 
					 | 
				
			||||||
set cmdline modules=loop,squashfs quiet
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}::::${dns}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
set server http://${next-server}
 | 
					 | 
				
			||||||
set apkovl ${server}/thinclient.apkovl.tar.gz
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
set base-url ${alpinelinux_mirror}
 | 
					 | 
				
			||||||
set dir ${alpinelinux_base_dir}/${alpine_version}/releases/${os_arch}/netboot
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
set vmlinuz ${base-url}/${dir}/vmlinuz-lts
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
set initramfs ${base-url}/${dir}/initramfs-lts
 | 
					 | 
				
			||||||
set modloop ${base-url}/${dir}/modloop-lts
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
set repo ${alpinelinux_mirror}/${alpinelinux_base_dir}/${alpine_version}/main
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
imgfree
 | 
					 | 
				
			||||||
kernel ${vmlinuz} ${ipparam} ${cmdline} alpine_repo=${repo} modloop=${modloop} apkovl=${apkovl} initrd=initrd.magic
 | 
					 | 
				
			||||||
initrd ${initramfs}
 | 
					 | 
				
			||||||
echo
 | 
					 | 
				
			||||||
echo MD5sums:
 | 
					 | 
				
			||||||
md5sum vmlinuz-lts initramfs-lts
 | 
					 | 
				
			||||||
boot
 | 
					 | 
				
			||||||
@ -5,7 +5,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
set win_arch x64
 | 
					set win_arch x64
 | 
				
			||||||
set win_size small
 | 
					set win_size small
 | 
				
			||||||
set win_base_url http://${next-server}/win-pe
 | 
					 | 
				
			||||||
goto ${menu} ||
 | 
					goto ${menu} ||
 | 
				
			||||||
 | 
					
 | 
				
			||||||
:windows
 | 
					:windows
 | 
				
			||||||
@ -16,7 +15,7 @@ item --gap Installers
 | 
				
			|||||||
item win_install ${space} Load ${os} Installer...
 | 
					item win_install ${space} Load ${os} Installer...
 | 
				
			||||||
item --gap Options:
 | 
					item --gap Options:
 | 
				
			||||||
item arch_set ${space} Architecture [ ${win_arch} ]
 | 
					item arch_set ${space} Architecture [ ${win_arch} ]
 | 
				
			||||||
item size_set ${space} Preinstalled software package [ ${win_size} ]
 | 
					imtem size_set ${space} Preinstalled software package [ ${win_size} ]
 | 
				
			||||||
item url_set ${space} Base URL [ ${win_base_url} ]
 | 
					item url_set ${space} Base URL [ ${win_base_url} ]
 | 
				
			||||||
choose win_version || goto windows_exit
 | 
					choose win_version || goto windows_exit
 | 
				
			||||||
goto ${win_version}
 | 
					goto ${win_version}
 | 
				
			||||||
@ -27,7 +26,6 @@ goto windows
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
:size_set
 | 
					:size_set
 | 
				
			||||||
iseq ${win_size} small && set win_size large || set win_size small
 | 
					iseq ${win_size} small && set win_size large || set win_size small
 | 
				
			||||||
goto windows
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
:url_set
 | 
					:url_set
 | 
				
			||||||
echo Set the HTTP URL of an extracted Windows ISO without the trailing slash:
 | 
					echo Set the HTTP URL of an extracted Windows ISO without the trailing slash:
 | 
				
			||||||
 | 
				
			|||||||
@ -7,7 +7,7 @@ networks:
 | 
				
			|||||||
services:
 | 
					services:
 | 
				
			||||||
  netboot:
 | 
					  netboot:
 | 
				
			||||||
    build:
 | 
					    build:
 | 
				
			||||||
      context: ./build
 | 
					      context: ./build-netbootxyz
 | 
				
			||||||
    # image: ghcr.io/netbootxyz/netbootxyz
 | 
					    # image: ghcr.io/netbootxyz/netbootxyz
 | 
				
			||||||
    restart: unless-stopped
 | 
					    restart: unless-stopped
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user