diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml index 092a568fc01..34dc7bc03cb 100644 --- a/.github/workflows/assets.yml +++ b/.github/workflows/assets.yml @@ -21,7 +21,7 @@ on: # yamllint disable-line rule:truthy jobs: create_release: - runs-on: buildjet-4vcpu-ubuntu-2204 + runs-on: X64 outputs: release_id: ${{ steps.create_release.outputs.release_id }} upload_url: ${{ steps.create_release.outputs.upload_url }} @@ -46,11 +46,12 @@ jobs: echo "release_id=$release_id" >> "$GITHUB_OUTPUT" echo "upload_url=$upload_url" >> "$GITHUB_OUTPUT" build: - runs-on: buildjet-4vcpu-ubuntu-2204 + runs-on: X64 needs: create_release strategy: fail-fast: false matrix: + hv: [kvm, kubevirt] arch: [amd64, arm64] steps: - name: checkout repo @@ -73,20 +74,20 @@ jobs: # if the default server is responding -- we can skip apt update $APT_INSTALL || { sudo apt update && $APT_INSTALL ; } echo "ARCH=${{ matrix.arch }}" >> "$GITHUB_ENV" + echo "EVEHV=${{ matrix.hv }}" >> "$GITHUB_ENV" echo "TAG=$(git describe --always --tags | grep -E '[0-9]+\.[0-9]+\.[0-9]' || echo snapshot)" >> "$GITHUB_ENV" - name: ensure clean assets directory run: | rm -rf assets && mkdir -p assets - name: Pull the EVE release from DockerHUB or build it run: | - HV=kvm - if [ "${{ github.event.repository.full_name }}" = "lf-edge/eve" ]; then - EVE=lfedge/eve:${TAG}-${HV}-${{ env.ARCH }} + if [ "${{ github.event.repository.full_name }}" = "rene/eve" ]; then + EVE=10.208.13.132/lfedge/eve:${TAG}-${{ env.EVEHV }}-${{ env.ARCH }} docker pull "$EVE" else make pkgs - make HV=${HV} ZARCH=${{ env.ARCH }} eve - EVE=lfedge/eve:$(make version)-${HV}-${{ env.ARCH }} + make HV=${{ env.EVEHV }} ZARCH=${{ env.ARCH }} eve + EVE=10.208.13.132/lfedge/eve:$(make version)-${{ env.EVEHV }}-${{ env.ARCH }} fi docker run "$EVE" rootfs > assets/rootfs.img docker run "$EVE" installer_net | tar -C assets -xvf - @@ -100,8 +101,7 @@ jobs: sed -e 's#{mac:hexhyp}#{ip}#' < assets/ipxe.efi.cfg > assets/ipxe.efi.ip.cfg - name: Pull eve-sources and publish collected_sources.tar.gz to assets run: | - HV=kvm - EVE_SOURCES=lfedge/eve-sources:${TAG}-${HV}-${{ env.ARCH }} + EVE_SOURCES=10.208.13.132/lfedge/eve-sources:${TAG}-${{ env.EVEHV }}-${{ env.ARCH }} docker pull "$EVE_SOURCES" docker create --name eve_sources "$EVE_SOURCES" bash docker export --output assets/collected_sources.tar.gz eve_sources diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f40ffd7a795..701228e8ac9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,15 +109,11 @@ jobs: hv: kvm platform: "rt" - arch: arm64 - hv: kvm + hv: [kvm, kubevirt] platform: "nvidia-jp5" - arch: arm64 - hv: kvm + hv: [kvm, kubevirt] platform: "nvidia-jp6" - exclude: - - arch: arm64 - hv: kubevirt - platform: "generic" steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/buildondemand.yml b/.github/workflows/buildondemand.yml index f657b42ade9..2577bdf6bb9 100644 --- a/.github/workflows/buildondemand.yml +++ b/.github/workflows/buildondemand.yml @@ -89,7 +89,7 @@ jobs: fail-fast: false matrix: arch: [arm64, amd64] - hv: [xen, kvm] + hv: [xen, kvm, kubevirt] platform: ["generic"] include: - arch: riscv64 @@ -99,10 +99,10 @@ jobs: hv: kvm platform: "rt" - arch: arm64 - hv: kvm + hv: [kvm, kubevirt] platform: "nvidia-jp5" - arch: arm64 - hv: kvm + hv: [kvm, kubevirt] platform: "nvidia-jp6" - arch: arm64 hv: kvm diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b5d980c2ef3..8e8b50ed638 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,16 +19,16 @@ on: # yamllint disable-line rule:truthy jobs: # 1) non-ARM packages, fully parallel packages-non-arm: - if: github.event.repository.full_name == 'lf-edge/eve' + if: github.event.repository.full_name == 'rene/eve' runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: include: - - os: ubuntu-22.04 + - os: X64 arch: amd64 platform: "generic" - - os: ubuntu-latest + - os: X64 arch: riscv64 platform: "generic" steps: @@ -61,7 +61,7 @@ jobs: run: | SUCCESS= for i in 1 2 3; do - if make -e V=1 ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then + if make -e V=1 REGISTRY=10.208.13.132 ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then SUCCESS=true break else @@ -89,7 +89,7 @@ jobs: # 2) ARM packages, serialized packages-arm: - if: github.event.repository.full_name == 'lf-edge/eve' + if: github.event.repository.full_name == 'rene/eve' runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -138,7 +138,7 @@ jobs: echo "TAG=$(echo "$REF" | sed -e 's#^.*/##' -e 's#master#snapshot#' -e 's#main#snapshot#')" >> "$GITHUB_ENV" - name: Login to Docker Hub - if: ${{ github.event.repository.full_name }}== 'lf-edge/eve' + if: ${{ github.event.repository.full_name }}== 'rene/eve' uses: docker/login-action@v3 with: username: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }} @@ -150,7 +150,7 @@ jobs: # sadly, our build sometimes times out on network access # and running out of disk space: re-trying for 3 times for i in 1 2 3; do - if make -e V=1 ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then + if make -e V=1 REGISTRY=10.208.13.132 ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then SUCCESS=true break else @@ -182,24 +182,24 @@ jobs: # 3) downstream jobs depend on both package jobs eve: - if: github.event.repository.full_name == 'lf-edge/eve' + if: github.event.repository.full_name == 'rene/eve' needs: [packages-non-arm, packages-arm] - runs-on: ubuntu-latest + runs-on: X64 strategy: fail-fast: false matrix: arch: [arm64, amd64] - hv: [kvm, xen] + hv: [kvm, xen, kubevirt] platform: ["generic"] include: - arch: riscv64 hv: mini platform: "generic" - arch: arm64 - hv: kvm + hv: [kvm, kubevirt] platform: "nvidia-jp5" - arch: arm64 - hv: kvm + hv: [kvm, kubevirt] platform: "nvidia-jp6" steps: - uses: actions/checkout@v4 @@ -207,13 +207,13 @@ jobs: fetch-depth: 0 - uses: ./.github/actions/run-make with: - command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push eve" + command: "V=1 REGISTRY=10.208.13.132 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push eve" dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }} dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }} - uses: ./.github/actions/run-make if: matrix.arch != 'riscv64' with: - command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push sbom collected_sources compare_sbom_collected_sources publish_sources" + command: "V=1 REGISTRY=10.208.13.132 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push sbom collected_sources compare_sbom_collected_sources publish_sources" dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }} dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }} - name: Clean @@ -225,22 +225,22 @@ jobs: rm -rf ~/.linuxkit || : manifest: - if: github.event.repository.full_name == 'lf-edge/eve' + if: github.event.repository.full_name == 'rene/eve' needs: [packages-non-arm, packages-arm] - runs-on: ubuntu-latest + runs-on: X64 steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: ./.github/actions/run-make with: - command: "V=1 LINUXKIT_PKG_TARGET=manifest pkgs" + command: "V=1 REGISTRY=10.208.13.132 LINUXKIT_PKG_TARGET=manifest pkgs" dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }} dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }} trigger_assets: - if: ${{ (startsWith(github.ref, 'refs/tags/')) && (github.event.repository.full_name == 'lf-edge/eve') }} + if: ${{ (startsWith(github.ref, 'refs/tags/')) && (github.event.repository.full_name == 'rene/eve') }} needs: [manifest, eve] - uses: lf-edge/eve/.github/workflows/assets.yml@master + uses: rene/eve/.github/workflows/assets.yml@master with: tag_ref: ${{ github.ref_name }} diff --git a/Makefile b/Makefile index 2a718a795f1..b3a12f28311 100644 --- a/Makefile +++ b/Makefile @@ -493,14 +493,13 @@ $(DOCKERFILE_FROM_CHECKER): $(DOCKERFILE_FROM_CHECKER_DIR)/*.go $(DOCKERFILE_FRO IGNORE_DOCKERFILE_HASHES_PKGS=alpine installer IGNORE_DOCKERFILE_HASHES_EVE_TOOLS=bpftrace-compiler -IGNORE_DOCKERFILE_DOT_GO_DIR=$(shell find .go/ -name Dockerfile -exec echo "-i {}" \;) IGNORE_DOCKERFILE_HASHES_PKGS_ARGS=$(foreach pkg,$(IGNORE_DOCKERFILE_HASHES_PKGS),-i pkg/$(pkg)/Dockerfile) IGNORE_DOCKERFILE_HASHES_EVE_TOOLS_ARGS=$(foreach tool,$(IGNORE_DOCKERFILE_HASHES_EVE_TOOLS),$(addprefix -i ,$(shell find eve-tools/$(tool) -path '*/vendor' -prune -o -name Dockerfile -print))) .PHONY: check-docker-hashes-consistency check-docker-hashes-consistency: $(DOCKERFILE_FROM_CHECKER) @echo "Checking Dockerfiles for inconsistencies" - $(DOCKERFILE_FROM_CHECKER) ./ $(IGNORE_DOCKERFILE_HASHES_PKGS_ARGS) $(IGNORE_DOCKERFILE_HASHES_EVE_TOOLS_ARGS) $(IGNORE_DOCKERFILE_DOT_GO_DIR) + $(DOCKERFILE_FROM_CHECKER) ./ $(IGNORE_DOCKERFILE_HASHES_PKGS_ARGS) $(IGNORE_DOCKERFILE_HASHES_EVE_TOOLS_ARGS) yetus: @echo Running yetus @@ -763,8 +762,8 @@ ifeq ($(ROOTFS_FORMAT),squash) endif $(QUIET): $@: Succeeded -$(GET_DEPS): $(GOBUILDER) - $(QUIET)$(DOCKER_GO) "make" $(GET_DEPS_DIR) +$(GET_DEPS): + $(MAKE) -C $(GET_DEPS_DIR) GOOS=$(LOCAL_GOOS) sbom_info: @echo "$(SBOM)" @@ -811,9 +810,9 @@ compare_sbom_collected_sources: $(COLLECTED_SOURCES) $(SBOM) | $(COMPARESOURCES) publish_sources: $(COLLECTED_SOURCES) $(QUIET): $@: Begin cp pkg/sources/* $(SOURCES_DIR) - $(LINUXKIT) $(DASH_V) pkg $(LINUXKIT_PKG_TARGET) $(LINUXKIT_ORG_TARGET) --platforms linux/$(ZARCH) --hash-path $(CURDIR) --hash $(ROOTFS_VERSION)-$(HV) --docker $(if $(strip $(EVE_REL)),--release) $(EVE_REL)$(if $(strip $(EVE_REL)),-$(HV)) $(SOURCES_DIR) $| + $(LINUXKIT) $(DASH_V) pkg $(LINUXKIT_PKG_TARGET) $(LINUXKIT_ORG_TARGET) --builder-image renezededa/buildkit:latest --platforms linux/$(ZARCH) --hash-path $(CURDIR) --hash $(ROOTFS_VERSION)-$(HV) --docker $(if $(strip $(EVE_REL)),--release) $(EVE_REL)$(if $(strip $(EVE_REL)),-$(HV)) $(SOURCES_DIR) $| $(QUIET)if [ -n "$(EVE_REL)" ] && [ $(HV) = $(HV_DEFAULT) ]; then \ - $(LINUXKIT) $(DASH_V) pkg $(LINUXKIT_PKG_TARGET) $(LINUXKIT_ORG_TARGET) --platforms linux/$(ZARCH) --hash-path $(CURDIR) --hash $(EVE_REL)-$(HV) --docker --release $(EVE_REL) $(SOURCES_DIR) $| ;\ + $(LINUXKIT) $(DASH_V) pkg $(LINUXKIT_PKG_TARGET) --builder-image renezededa/buildkit:latest $(LINUXKIT_ORG_TARGET) --platforms linux/$(ZARCH) --hash-path $(CURDIR) --hash $(EVE_REL)-$(HV) --docker --release $(EVE_REL) $(SOURCES_DIR) $| ;\ fi $(QUIET): $@: Succeeded @@ -883,9 +882,9 @@ eve: $(INSTALLER) $(EVE_ARTIFACTS) current $(RUNME) $(BUILD_YML) | $(BUILD_DIR) $(QUIET): "$@: Begin: EVE_REL=$(EVE_REL), HV=$(HV), LINUXKIT_PKG_TARGET=$(LINUXKIT_PKG_TARGET)" cp images/out/*.yml $| $(PARSE_PKGS) pkg/eve/Dockerfile.in > $|/Dockerfile - $(LINUXKIT) $(DASH_V) pkg $(LINUXKIT_PKG_TARGET) $(LINUXKIT_ORG_TARGET) --platforms linux/$(ZARCH) --hash-path $(CURDIR) --hash $(ROOTFS_VERSION)-$(HV) --docker $(if $(strip $(EVE_REL)),--release) $(EVE_REL)$(if $(strip $(EVE_REL)),-$(HV)) $(FORCE_BUILD) $| + $(LINUXKIT) $(DASH_V) pkg $(LINUXKIT_PKG_TARGET) --builder-image renezededa/buildkit:latest $(LINUXKIT_ORG_TARGET) --platforms linux/$(ZARCH) --hash-path $(CURDIR) --hash $(ROOTFS_VERSION)-$(HV) --docker $(if $(strip $(EVE_REL)),--release) $(EVE_REL)$(if $(strip $(EVE_REL)),-$(HV)) $(FORCE_BUILD) $| $(QUIET)if [ -n "$(EVE_REL)" ] && [ $(HV) = $(HV_DEFAULT) ]; then \ - $(LINUXKIT) $(DASH_V) pkg $(LINUXKIT_PKG_TARGET) $(LINUXKIT_ORG_TARGET) --platforms linux/$(ZARCH) --hash-path $(CURDIR) --hash $(EVE_REL)-$(if $(TAGPLAT),$(TAGPLAT)-)$(HV) --docker --release $(EVE_REL) $(FORCE_BUILD) $| ;\ + $(LINUXKIT) $(DASH_V) pkg $(LINUXKIT_PKG_TARGET) --builder-image renezededa/buildkit:latest $(LINUXKIT_ORG_TARGET) --platforms linux/$(ZARCH) --hash-path $(CURDIR) --hash $(EVE_REL)-$(if $(TAGPLAT),$(TAGPLAT)-)$(HV) --docker --release $(EVE_REL) $(FORCE_BUILD) $| ;\ fi $(QUIET): $@: Succeeded @@ -1052,7 +1051,7 @@ eve-%: pkg/%/Dockerfile build-tools $(RESCAN_DEPS) $(QUIET): "$@: Begin: LINUXKIT_PKG_TARGET=$(LINUXKIT_PKG_TARGET)" $(eval LINUXKIT_DOCKER_LOAD := $(if $(filter $(PKGS_DOCKER_LOAD),$*),--docker,)) $(eval LINUXKIT_BUILD_PLATFORMS_LIST := $(call uniq,linux/$(ZARCH) $(if $(filter $(PKGS_HOSTARCH),$*),linux/$(HOSTARCH),))) - $(eval LINUXKIT_BUILD_PLATFORMS := --platforms $(subst $(space),$(comma),$(strip $(LINUXKIT_BUILD_PLATFORMS_LIST)))) + $(eval LINUXKIT_BUILD_PLATFORMS := --builder-image renezededa/buildkit:latest --platforms $(subst $(space),$(comma),$(strip $(LINUXKIT_BUILD_PLATFORMS_LIST)))) $(eval LINUXKIT_FLAGS := $(if $(filter manifest,$(LINUXKIT_PKG_TARGET)),,$(FORCE_BUILD) $(LINUXKIT_DOCKER_LOAD) $(LINUXKIT_BUILD_PLATFORMS))) $(QUIET)$(LINUXKIT) $(DASH_V) pkg $(LINUXKIT_PKG_TARGET) $(LINUXKIT_ORG_TARGET) $(LINUXKIT_OPTS) $(LINUXKIT_FLAGS) --build-yml $(call get_pkg_build_yml,$*) pkg/$* $(QUIET)if [ -n "$(PRUNE)" ]; then \ diff --git a/build-tools/src/scripts/Dockerfile b/build-tools/src/scripts/Dockerfile index e79351a35a0..520e9c18a2d 100644 --- a/build-tools/src/scripts/Dockerfile +++ b/build-tools/src/scripts/Dockerfile @@ -55,6 +55,12 @@ RUN rm -rf /tmp/zfs-out/usr/share && rm -rf /tmp/zfs-out/usr/src && \ RUN cp -r /tmp/zfs-out/* / +COPY domain.crt /tmp/domain.crt + +RUN mkdir -p /etc/docker/certs.d/10.208.13.132 +RUN cp /tmp/domain.crt /etc/docker/certs.d/10.208.13.132/ca.crt +RUN cp /tmp/domain.crt /usr/local/share/ca-certificates/selfs.crt +RUN update-ca-certificates RUN go install github.com/golang/protobuf/protoc-gen-go@v1.5.2 RUN go install gotest.tools/gotestsum@v1.7.0 @@ -64,3 +70,4 @@ RUN mv /go/bin/* /usr/bin ENV HOME /home/${USER} ENV GOFLAGS=-mod=vendor ENV GO111MODULE=on +ENV REGISTRY=${REGISTRY} diff --git a/build-tools/src/scripts/build-all-tags.sh b/build-tools/src/scripts/build-all-tags.sh index 0c94888b40e..072cc51e417 100755 --- a/build-tools/src/scripts/build-all-tags.sh +++ b/build-tools/src/scripts/build-all-tags.sh @@ -11,7 +11,7 @@ if [ $# -lt 2 ] ; then fi REPO=${1:-lfedge/eve} -CMD=${2:-"LINUXKIT_PKG_TARGET=push ; make pkgs ; make eve"} +CMD=${2:-"REGISTRY=${LINUXKIT_ORG_TARGET} LINUXKIT_PKG_TARGET=push ; make pkgs ; make eve"} case $(uname -m) in x86_64) ARCH=-amd64 diff --git a/build-tools/src/scripts/domain.crt b/build-tools/src/scripts/domain.crt new file mode 100644 index 00000000000..12dd6bcd937 --- /dev/null +++ b/build-tools/src/scripts/domain.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFgjCCA2qgAwIBAgIUDbZ7xVa2l/BFggSc7lSPmb8J+/owDQYJKoZIhvcNAQEL +BQAwYTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5 +MQwwCgYDVQQKDANPcmcxDTALBgNVBAsMBFVuaXQxFjAUBgNVBAMMDTEwLjIwOC4x +My4xMzIwHhcNMjUwNTAxMTEwMTA4WhcNMjYwNTAxMTEwMTA4WjBhMQswCQYDVQQG +EwJVUzEOMAwGA1UECAwFU3RhdGUxDTALBgNVBAcMBENpdHkxDDAKBgNVBAoMA09y +ZzENMAsGA1UECwwEVW5pdDEWMBQGA1UEAwwNMTAuMjA4LjEzLjEzMjCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBALNzmntLtp7jh0w2go0dcAoQ5yUu9w2r +/1nwtKg4J7mp0qICLdUxFZ/YDcXDTGex6jcnCd2U3yuayStaGkyceG2+u6G2av9M +5pdzoTyT6zFFvYjxbIENsBlVJKY7CRx8Ya5eM0CPEcLgW/BlQOl/R0r/Z8iR34Qz +89q+Y46kCQvCyFKxNflwDChMNb91Aa/RLDBrIl7kzOWKwn9cwcIKxkNR92W+SNpi +s8rV3O1zvKoh3NBhHZbEYV3m+x9xxCNSgkCyYxeuNJk6NkUWvDAaNOmndAm6u6He +ECbKkqYK/xzlM9piaOXFGOYnIpAVQ3LejDhx2wltB2yhhY0rau40UrbZJ0MywQRR +a5DWhWZBNgyBafsb02WWlF0ZIoGUt/uzTtvzJ79F33HBW/FtZwegVLGowKmyFXFd +SfnDg8ZuD4tbE2ojjBkdb+MEKdbB/tW9ShkUB1lYvfAJYwAKRzFa0iyPdEz8jMQ/ +tYxqmInPYF3Vdg69qch/W/UelKAZidiWvX2K1Z5D3M3Vk24ImgsjX5bBWp4P2Cum +D6axGdmPs9P7CPrDoGcee8KDiQbx3SW675tAX9gbBwtHtF7toN3I+QKe9iuHqOzF +UTHWZK83c08ci2+U7J7OKQcpDTgLNEzRlNCv7D0y4V7LBtUCCV0tsncoDyIQF5ay +nkbRYnvBVKZHAgMBAAGjMjAwMA8GA1UdEQQIMAaHBArQDYQwHQYDVR0OBBYEFPeu +KU/n/Cdhj1/rWUiGoGaibPdmMA0GCSqGSIb3DQEBCwUAA4ICAQBKB/60DQMYSX94 +Rj5+fisotHYq1tjK6i0HgWQk9GmmP3C58rSnKqDTBg1oreZMyK+o54y4r2oDbDus +Ad+cBd3K/N3rOFkicOaaWRt3Hh1M0oB3XavqCkSY6ceNRvc7g/Dz9psWXC4MJTgA +QGVrKk2UsVwNzPbZ3zdXVa/0uZHXvCCtKEAiKBokLnY3u0l4/Dr8NuEud61xaTMI +/h+ZQXf2I6TlVJc2ip37k9/R4Spd/wsIcqe3H4eYWb59Md8056lFULhxtqgV2VVw +KArD9myQRqcUnxe2TKRxUSjNKdlbaJKWGm+9q8mlJxzizG6UEAIZ3Sve3eRZBn9E +7ZrOZRlFnGHZArYNJuF9cXJXOA8W56etpTWCxG0BnfUaV7Hcv+PzkftUC2F/XAhk +eg/afvBEs9ZSghzXIwkN8WJNfoaYR9ms7wcdDYDdwHcSgcYlFTepqjL71ePYxass +67fBqXp0B+/Vii9eKXFQg4w/vhN0CRmv43PXNqXd4vS46upCvntHaULaD4PwlwHh +ciAEf/Y6wBYvDGvnktSISSCtQOHc8GPjtP2+WE3HCNkODEOWHSAZiNnJic0twt7b +Ev3M2Uzar7PTwelisHjEk3X+//ei18UZOi2KkzKTyxHwMhGV9dCG4VZFCubY4l4v +NTJMNUpoyAVm4PGjMnr59uPRow6TNw== +-----END CERTIFICATE----- diff --git a/eve-tools/bpftrace-compiler/go.mod b/eve-tools/bpftrace-compiler/go.mod index 907066cb39b..941c196403c 100644 --- a/eve-tools/bpftrace-compiler/go.mod +++ b/eve-tools/bpftrace-compiler/go.mod @@ -23,7 +23,7 @@ require ( github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 // indirect github.com/containerd/console v1.0.4 // indirect github.com/containerd/containerd/api v1.8.0 // indirect - github.com/containerd/containerd/v2 v2.0.4 // indirect + github.com/containerd/containerd/v2 v2.0.5 // indirect github.com/containerd/continuity v0.4.5 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect diff --git a/eve-tools/bpftrace-compiler/go.sum b/eve-tools/bpftrace-compiler/go.sum index 12b4a666d60..afd24a1e0b4 100644 --- a/eve-tools/bpftrace-compiler/go.sum +++ b/eve-tools/bpftrace-compiler/go.sum @@ -22,8 +22,8 @@ github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0= github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc= -github.com/containerd/containerd/v2 v2.0.4 h1:+r7yJMwhTfMm3CDyiBjMBQO8a9CTBxL2Bg/JtqtIwB8= -github.com/containerd/containerd/v2 v2.0.4/go.mod h1:5j9QUUaV/cy9ZeAx4S+8n9ffpf+iYnEj4jiExgcbuLY= +github.com/containerd/containerd/v2 v2.0.5 h1:2vg/TjUXnaohAxiHnthQg8K06L9I4gdYEMcOLiMc8BQ= +github.com/containerd/containerd/v2 v2.0.5/go.mod h1:Qqo0UN43i2fX1FLkrSTCg6zcHNfjN7gEnx3NPRZI+N0= github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= diff --git a/pkg/grub/Dockerfile b/pkg/grub/Dockerfile index f95b44fb068..037adcde38b 100644 --- a/pkg/grub/Dockerfile +++ b/pkg/grub/Dockerfile @@ -51,7 +51,7 @@ ENV GRUB_PLATFORM=efi # hadolint ignore=DL3006 FROM grub-build-${TARGETARCH} AS grub-build -ENV GRUB_REPO=https://git.savannah.gnu.org/cgit/grub.git +ENV GRUB_REPO=http://10.208.13.10 COPY patches /patches COPY patches-2.06 /patches-2.06 @@ -63,7 +63,7 @@ RUN ln -s python3 /usr/bin/python && \ ADD ${GRUB_REPO}/snapshot/grub-${GRUB_COMMIT}.tar.gz /grub.tar.gz ENV GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263 -ADD --keep-git-dir git://git.sv.gnu.org/gnulib#${GNULIB_REVISION} /gnulib +ADD --keep-git-dir https://github.com/coreutils/gnulib.git#${GNULIB_REVISION} /gnulib # the below does a weird init of a git repo, because we are not cloning the # repo, yet we need to be in a repo to apply patches with `git am`. diff --git a/pkg/nvidia/Dockerfile b/pkg/nvidia/Dockerfile index eb8cb6d7a02..2dfabe17b61 100644 --- a/pkg/nvidia/Dockerfile +++ b/pkg/nvidia/Dockerfile @@ -19,8 +19,8 @@ RUN git config --global user.email 'builder@projecteve.dev' && \ git config --global user.name 'Project EVE' # Jetpack tarballs -ENV JETSON_JP5=https://developer.nvidia.com/downloads/embedded/l4t/r35_release_v5.0/release/jetson_linux_r35.5.0_aarch64.tbz2 -ENV JETSON_JP6=https://developer.nvidia.com/downloads/embedded/l4t/r36_release_v3.0/release/jetson_linux_r36.3.0_aarch64.tbz2 +ENV JETSON_JP5=http://10.208.13.10/jetson_linux_r35.5.0_aarch64.tbz2 +ENV JETSON_JP6=http://10.208.13.10/jetson_linux_r36.3.0_aarch64.tbz2 # Default Jetpack version ENV JETSON_LINUX=${JETSON_JP5}