Forráskód Böngészése

Merge pull request #1170 from netbootxyz/RC

Release 2.0.63
Antony Messerli 2 éve
szülő
commit
68c05ba557

+ 1 - 1
.github/workflows/development.yml

@@ -31,7 +31,7 @@ jobs:
         ./script/build_release dev
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v1-node16
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

+ 1 - 1
.github/workflows/pull-requests.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install ansible ansible-lint
+        pip install ansible==6.4.0 ansible-lint==6.7.0
 
     - name: Syntax Check
       run: |

+ 1 - 1
.github/workflows/release-candidate.yml

@@ -34,7 +34,7 @@ jobs:
         ./script/build_release rc
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v1-node16
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

+ 1 - 1
.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
         ./script/build_release release
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v1-node16
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

+ 1 - 1
.github/workflows/rolling.yml

@@ -44,7 +44,7 @@ jobs:
         ./script/build_release rolling
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v1-node16
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

+ 5 - 0
CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.63] - 2022-10-23
+#### Added
+- Fedora 37 (to be released)
+- Ubuntu 20.10 (Kinetic Kudu)
+
 ## [2.0.62] - 2022-09-13
 #### Changes
 - Uses inst.text instead of text on redhat based distros

+ 1 - 1
README.md

@@ -98,7 +98,7 @@ The build output will be located in /var/www/html by default.
 #### Deploying with Docker
 
 ```
-docker build -t localbuild -f Dockerfile-build .
+docker build -t localbuild -f Dockerfile .
 docker run --rm -it -v $(pwd):/buildout localbuild
 ```
 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 120 - 156
endpoints.yml


+ 27 - 17
roles/netbootxyz/defaults/main.yml

@@ -147,8 +147,8 @@ releases:
     mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
-    - code_name: 2022.09.03
-      name: 2022.09.03
+    - code_name: 2022.10.01
+      name: 2022.10.01
   blackarch:
     enabled: true
     menu: linux
@@ -180,11 +180,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 36.20220820.3.0
+    - code_name: 36.20221001.3.0
       name: stable
-    - code_name: 36.20220906.2.0
+    - code_name: 36.20221014.2.0
       name: testing
-    - code_name: 37.20220910.1.0
+    - code_name: 37.20221015.1.0
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -230,12 +230,12 @@ releases:
     mirror: http://mirrors.kernel.org
     name: Fedora
     versions:
+    - code_name: 37
+      name: 37
     - code_name: 36
       name: 36
     - code_name: 35
       name: 35
-    - code_name: 34
-      name: 34
   flatcar:
     enabled: true
     menu: linux
@@ -280,8 +280,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.27-core169
-      name: 2.27 Core169
+    - code_name: 2.27-core171
+      name: 2.27 Core171
   k3os:
     enabled: true
     menu: linux
@@ -334,6 +334,8 @@ releases:
       name: openEuler-20.03-LTS-SP3
     - code_name: openEuler-22.03-LTS
       name: openEuler-22.03-LTS
+    - code_name: openEuler-22.09
+      name: openEuler-22.09
   openbsd:
     base_dir: pub/OpenBSD
     enabled: true
@@ -341,6 +343,12 @@ releases:
     mirror: http://ftp.openbsd.org
     name: OpenBSD
     versions:
+    - code_name: '7.2'
+      image_ver: '72'
+      name: '7.2'
+    - code_name: '7.1'
+      image_ver: '71'
+      name: '7.1'
     - code_name: '7.0'
       image_ver: '70'
       name: '7.0'
@@ -460,14 +468,14 @@ releases:
     mirror: https://netboot.joyent.com/os/
     name: SmartOS
     versions:
-    - code_name: 20220908T004516Z
-      name: 20220908T004516Z
-    - code_name: 20220825T001415Z
-      name: 20220825T001415Z
-    - code_name: 20220811T015517Z
-      name: 20220811T015517Z
-    - code_name: 20220728T031731Z
-      name: 20220728T031731Z
+    - code_name: 20221020T001410Z
+      name: 20221020T001410Z
+    - code_name: 20221006T160428Z
+      name: 20221006T160428Z
+    - code_name: 20221006T003323Z
+      name: 20221006T003323Z
+    - code_name: 20220922T001804Z
+      name: 20220922T001804Z
   talos:
     enabled: true
     menu: linux
@@ -602,6 +610,8 @@ releases:
     mirror: http://archive.ubuntu.com
     name: Ubuntu
     versions:
+    - code_name: kinetic
+      name: 22.10 Kinetic Kudu
     - code_name: jammy
       name: 22.04 LTS Jammy Jellyfish
     - code_name: focal

+ 1 - 1
roles/netbootxyz/templates/menu/fedora.ipxe.j2

@@ -61,7 +61,7 @@ goto boot
 
 :kickstart
 echo -n Specify kickstart URL for ${os} ${osversion}: && read ksurl
-set params ks=${ksurl} ||
+set params inst.ks=${ksurl} ||
 goto boot
 
 :boot

+ 10 - 0
roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2

@@ -6,6 +6,7 @@ goto ${menu} ||
 set os Ubuntu Live
 menu ${os}
 item --gap ${os} Versions
+item kinetic ${space} ${os} 22.10
 item jammy ${space} ${os} 22.04
 item focal ${space} ${os} 20.04
 item bionic ${space} ${os} 18.04
@@ -14,6 +15,14 @@ menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
+:kinetic
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "ubuntu" and 'squash' in key and value.version == "22.10" %}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title }}
+{% endif %}
+{% endfor %}
+goto flavor_select
+
 :jammy
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "ubuntu" and 'squash' in key and value.version == "22.04" %}
@@ -65,6 +74,7 @@ boot
 
 :20.04-boot
 :22.04-boot
+:22.10-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd

+ 1 - 1
roles/netbootxyz/templates/menu/ubuntu.ipxe.j2

@@ -26,8 +26,8 @@ item older_release ${space} Set release codename...
 choose ubuntu_version || goto ubuntu_exit
 iseq ${ubuntu_version} older_release && goto older_release ||
 iseq ${ubuntu_version} focal && set install_type sub ||
-iseq ${ubuntu_version} impish && set install_type sub ||
 iseq ${ubuntu_version} jammy && set install_type sub ||
+iseq ${ubuntu_version} kinetic && set install_type sub ||
 iseq ${ubuntu_version} focal-legacy && set ubuntu_version focal ||
 iseq ${install_type} sub && goto boot_type ||
 iseq ${os_arch} arm64 && echo "arm64 not supported on legacy network installs, please use 20.04 Subiquity and up" && sleep 5 && goto ubuntu ||

+ 1 - 1
version.txt

@@ -1 +1 @@
-2.0.62
+2.0.63

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott