diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml index 30177e9f4..0f0dfd0f5 100644 --- a/.github/actions/setup-environment/action.yml +++ b/.github/actions/setup-environment/action.yml @@ -21,7 +21,7 @@ runs: - name: Setup go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.20' - name: Check run: | for addr in $(ip addr list|sed -En -e 's/.*inet ([0-9.]+).*/\1/p') diff --git a/.github/workflows/eden_gcp.yml b/.github/workflows/eden_gcp.yml index 2ae9446c6..a169b984a 100644 --- a/.github/workflows/eden_gcp.yml +++ b/.github/workflows/eden_gcp.yml @@ -34,7 +34,7 @@ jobs: - name: setup go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.20' - name: Check run: | for addr in $(ip addr list|sed -En -e 's/.*inet ([0-9.]+).*/\1/p') diff --git a/.github/workflows/eden_setup.yml b/.github/workflows/eden_setup.yml index cf9043d6e..0e47525a2 100644 --- a/.github/workflows/eden_setup.yml +++ b/.github/workflows/eden_setup.yml @@ -24,7 +24,7 @@ jobs: - name: setup go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.20' - name: build docker images run: | make LINUXKIT_TARGET=build DOCKER_PLATFORM=linux/arm64 build-docker @@ -48,7 +48,7 @@ jobs: - name: setup go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.20' - name: build eden run: | make clean diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index d7e206bfe..bee035551 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -13,7 +13,7 @@ jobs: - name: setup go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.20' - name: run tests run: go test -json $(go list ./... | grep -v /eden/tests/) > test.json - name: Annotate tests diff --git a/Dockerfile b/Dockerfile index 1b696a15d..77571d29f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:8.12.0 as build +FROM lfedge/eve-alpine:12.1.0 as build ENV BUILD_PKGS go make qemu-img git RUN eve-alpine-deploy.sh diff --git a/eserver/Dockerfile b/eserver/Dockerfile index 9aad6067b..772b2c6f7 100644 --- a/eserver/Dockerfile +++ b/eserver/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:8.12.0 AS build +FROM lfedge/eve-alpine:12.1.0 AS build ENV BUILD_PKGS go git openssh-keygen RUN eve-alpine-deploy.sh diff --git a/processing/Dockerfile b/processing/Dockerfile index c3f176bbd..0ae7ec486 100644 --- a/processing/Dockerfile +++ b/processing/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:8.12.0 as build +FROM lfedge/eve-alpine:12.1.0 as build ENV BUILD_PKGS git ENV PKGS perl gawk git RUN eve-alpine-deploy.sh diff --git a/sdn/vm/Dockerfile b/sdn/vm/Dockerfile index f6597a317..82831ad16 100644 --- a/sdn/vm/Dockerfile +++ b/sdn/vm/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:8.12.0 as build +FROM lfedge/eve-alpine:12.1.0 as build ENV BUILD_PKGS git gcc go make wget libc-dev linux-headers ENV PKGS bash iptables ip6tables iproute2 dhcpcd ipset curl radvd ethtool jq tcpdump \ diff --git a/sdn/vm/api/endpoints.go b/sdn/vm/api/endpoints.go index 39e483da5..354679840 100644 --- a/sdn/vm/api/endpoints.go +++ b/sdn/vm/api/endpoints.go @@ -365,12 +365,13 @@ func (e TransparentProxy) ReferencesFromItem() []LogicalLabelRef { // iPXE-enabled client). // // Example config for dnsmasq: -// # Boot for iPXE. The idea is to send two different -// # filenames, the first loads iPXE, and the second tells iPXE what to -// # load. The dhcp-match sets the ipxe tag for requests from iPXE. -// #dhcp-boot=undionly.kpxe -// #dhcp-match=set:ipxe,175 # iPXE sends a 175 option. -// #dhcp-boot=tag:ipxe,http://boot.ipxe.org/demo/boot.php +// +// # Boot for iPXE. The idea is to send two different +// # filenames, the first loads iPXE, and the second tells iPXE what to +// # load. The dhcp-match sets the ipxe tag for requests from iPXE. +// #dhcp-boot=undionly.kpxe +// #dhcp-match=set:ipxe,175 # iPXE sends a 175 option. +// #dhcp-boot=tag:ipxe,http://boot.ipxe.org/demo/boot.php // // [1] https://ipxe.org/howto/chainloading type NetbootServer struct {