mirror of
https://github.com/GNS3/gns3-registry.git
synced 2025-04-04 09:49:10 +00:00
Merge branch 'master' into update-ubuntu-cloud
This commit is contained in:
Jeremy Grossmann
GitHub
commit
4b839320d4
2
.github/bin/docker_build
vendored
2
.github/bin/docker_build
vendored
@ -345,7 +345,7 @@ def needs_rebuild(image, default_repository=None):
|
||||
if base_name not in image_info:
|
||||
image_info[base_name] = get_time_layers(base_name)
|
||||
if not image_info[base_name]:
|
||||
sys.exit(f"Missing base image: {base_name}")
|
||||
sys.exit(f"{image['name']}: Missing base image: {base_name}")
|
||||
|
||||
# get information of image, if unknown
|
||||
if full_name not in image_info:
|
||||
|
||||
11
.github/workflows/build-docker-images.yml
vendored
11
.github/workflows/build-docker-images.yml
vendored
@ -63,13 +63,11 @@ jobs:
|
||||
- name: Build and push images
|
||||
env:
|
||||
# DOCKER_REPOSITORY - Repository for name-only images
|
||||
# DockerHub:
|
||||
#DOCKER_REPOSITORY: ${{ secrets.DOCKERHUB_REPOSITORY }}
|
||||
# GitHub Container Registry:
|
||||
#DOCKER_REPOSITORY: ghcr.io/${{ github.repository_owner }}
|
||||
# Both DockerHub and GitHub Container Registry:
|
||||
DOCKER_REPOSITORY: >-
|
||||
# Using multiple repositories will build images in all of them.
|
||||
DOCKER_REPOSITORY: |
|
||||
# DockerHub:
|
||||
${{ secrets.DOCKERHUB_REPOSITORY }}
|
||||
# GitHub Container Registry:
|
||||
ghcr.io/${{ github.repository_owner }}
|
||||
#
|
||||
# Variables whose name are starting with "DOCKER_LOGIN"
|
||||
@ -90,6 +88,7 @@ jobs:
|
||||
#
|
||||
IMAGES: ${{ inputs.images }}
|
||||
run: |
|
||||
DOCKER_REPOSITORY=$(echo "$DOCKER_REPOSITORY" | sed '/^#/d')
|
||||
set -f
|
||||
set -- $IMAGES
|
||||
set +f
|
||||
|
||||
@ -63,6 +63,13 @@
|
||||
"filesize": 86704128,
|
||||
"download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
|
||||
},
|
||||
{
|
||||
"filename": "FGT_VM64_KVM-v7.0.13.M-build0566-FORTINET.out.kvm.qcow2",
|
||||
"version": "7.0.13",
|
||||
"md5sum": "47a4bab29407153a635c54b64d6a226e",
|
||||
"filesize": 89325568,
|
||||
"download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
|
||||
},
|
||||
{
|
||||
"filename": "FGT_VM64_KVM-v7.0.12.M-build0523-FORTINET.out.kvm.qcow2",
|
||||
"version": "7.0.12",
|
||||
@ -367,6 +374,13 @@
|
||||
"hdb_disk_image": "empty30G.qcow2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "7.0.13",
|
||||
"images": {
|
||||
"hda_disk_image": "FGT_VM64_KVM-v7.0.13.M-build0566-FORTINET.out.kvm.qcow2",
|
||||
"hdb_disk_image": "empty30G.qcow2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "7.0.12",
|
||||
"images": {
|
||||
|
||||
@ -7,16 +7,65 @@
|
||||
"vendor_url": "https://www.huawei.com",
|
||||
"product_name": "HuaWei NE40E",
|
||||
"product_url": "https://e.huawei.com/en/products/enterprise-networking/routers/ne/ne40e",
|
||||
"registry_version": 4,
|
||||
"registry_version": 6,
|
||||
"status": "experimental",
|
||||
"availability": "service-contract",
|
||||
"maintainer": "none",
|
||||
"maintainer_email": "",
|
||||
"first_port_name": "eth0",
|
||||
"port_name_format": "Ethernet1/0/{0}",
|
||||
"qemu": {
|
||||
"adapter_type": "e1000",
|
||||
"adapters": 12,
|
||||
"custom_adapters": [
|
||||
{
|
||||
"adapter_number": 0,
|
||||
"port_name": "Gi0/0/0"
|
||||
},
|
||||
{
|
||||
"adapter_number": 1,
|
||||
"port_name": "Mgmt0/0"
|
||||
},
|
||||
{
|
||||
"adapter_number": 2,
|
||||
"port_name": "Ethernet1/0/0"
|
||||
},
|
||||
{
|
||||
"adapter_number": 3,
|
||||
"port_name": "Ethernet1/0/1"
|
||||
},
|
||||
{
|
||||
"adapter_number": 4,
|
||||
"port_name": "Ethernet1/0/2"
|
||||
},
|
||||
{
|
||||
"adapter_number": 5,
|
||||
"port_name": "Ethernet1/0/3"
|
||||
},
|
||||
{
|
||||
"adapter_number": 6,
|
||||
"port_name": "Ethernet1/0/4"
|
||||
},
|
||||
{
|
||||
"adapter_number": 7,
|
||||
"port_name": "Ethernet1/0/5"
|
||||
},
|
||||
{
|
||||
"adapter_number": 8,
|
||||
"port_name": "Ethernet1/0/6"
|
||||
},
|
||||
{
|
||||
"adapter_number": 9,
|
||||
"port_name": "Ethernet1/0/7"
|
||||
},
|
||||
{
|
||||
"adapter_number": 10,
|
||||
"port_name": "Ethernet1/0/8"
|
||||
},
|
||||
{
|
||||
"adapter_number": 11,
|
||||
"port_name": "Ethernet1/0/9"
|
||||
}
|
||||
],
|
||||
"ram": 2048,
|
||||
"cpus": 2,
|
||||
"hda_disk_interface": "ide",
|
||||
|
||||
@ -249,6 +249,7 @@
|
||||
"i82559er",
|
||||
"i82562",
|
||||
"i82801",
|
||||
"igb",
|
||||
"ne2k_pci",
|
||||
"pcnet",
|
||||
"rtl8139",
|
||||
|
||||
@ -249,6 +249,7 @@
|
||||
"i82559er",
|
||||
"i82562",
|
||||
"i82801",
|
||||
"igb",
|
||||
"ne2k_pci",
|
||||
"pcnet",
|
||||
"rtl8139",
|
||||
|
||||
@ -249,6 +249,7 @@
|
||||
"i82559er",
|
||||
"i82562",
|
||||
"i82801",
|
||||
"igb",
|
||||
"ne2k_pci",
|
||||
"pcnet",
|
||||
"rtl8139",
|
||||
@ -295,6 +296,7 @@
|
||||
"i82559er",
|
||||
"i82562",
|
||||
"i82801",
|
||||
"igb",
|
||||
"ne2k_pci",
|
||||
"pcnet",
|
||||
"rtl8139",
|
||||
|
||||
@ -249,6 +249,7 @@
|
||||
"i82559er",
|
||||
"i82562",
|
||||
"i82801",
|
||||
"igb",
|
||||
"ne2k_pci",
|
||||
"pcnet",
|
||||
"rtl8139",
|
||||
@ -295,6 +296,7 @@
|
||||
"i82559er",
|
||||
"i82562",
|
||||
"i82801",
|
||||
"igb",
|
||||
"ne2k_pci",
|
||||
"pcnet",
|
||||
"rtl8139",
|
||||
|
||||
@ -356,6 +356,7 @@
|
||||
"i82559er",
|
||||
"i82562",
|
||||
"i82801",
|
||||
"igb",
|
||||
"ne2k_pci",
|
||||
"pcnet",
|
||||
"rtl8139",
|
||||
@ -402,6 +403,7 @@
|
||||
"i82559er",
|
||||
"i82562",
|
||||
"i82801",
|
||||
"igb",
|
||||
"ne2k_pci",
|
||||
"pcnet",
|
||||
"rtl8139",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user