Permanent fork (#2)

Author: majst01

.circleci/config.yml

@@ -5,3 +5,4 @@ pcap/pcap.test
 pixiecore/pixiecore.test
 vendor/
 build/
+bin

.circleci/config.yml.tmpl

@@ -1,11 +1,9 @@
-FROM golang:1.15-buster as builder
+FROM golang:1.18-buster as builder
 COPY . /work/
 WORKDIR /work
-RUN cd cmd/pixiecore \
- && CGO_ENABLE=0 go build -trimpath -tags netgo \
- && strip /work/cmd/pixiecore/pixiecore
+RUN make
 
-FROM alpine:3.12
+FROM alpine:3.15
 RUN apk -U add ca-certificates
-COPY --from=builder /work/cmd/pixiecore/pixiecore /pixiecore
-ENTRYPOINT ["/pixiecore"]
+COPY --from=builder /work/bin/pixie /pixie
+ENTRYPOINT ["/pixie"]

.circleci/gen-config.go

@@ -1,21 +1,28 @@
+SHA := $(shell git rev-parse --short=8 HEAD)
+GITVERSION := $(shell git describe --long --all)
+BUILDDATE := $(shell date -Iseconds)
+VERSION := $(or ${VERSION},devel)
+
 GOCMD:=go
 GOMODULECMD:=GO111MODULE=on go
+LINKMODE := -extldflags '-static -s -w'
 
 # Local customizations to the above.
 ifneq ($(wildcard Makefile.defaults),)
 include Makefile.defaults
 endif
 
-all:
-	$(error Please request a specific thing, there is no default target)
-
-.PHONY: ci-prepare
-ci-prepare:
-	$(GOCMD) get -u github.com/estesp/manifest-tool
+all: pixie
 
-.PHONY: build
-build:
-	$(GOMODULECMD) install -v ./cmd/pixiecore
+.PHONY: pixie
+pixie: test
+	go build -tags netgo,osusergo \
+		 -ldflags "$(LINKMODE) -X 'github.com/metal-stack/v.Version=$(VERSION)' \
+								   -X 'github.com/metal-stack/v.Revision=$(GITVERSION)' \
+								   -X 'github.com/metal-stack/v.GitSHA1=$(SHA)' \
+								   -X 'github.com/metal-stack/v.BuildDate=$(BUILDDATE)'" \
+	   -o bin/pixie github.com/metal-stack/pixie/cmd
+	strip bin/pixie
 
 .PHONY: test
 test:
@@ -26,21 +33,6 @@ test:
 lint:
 	$(GOMODULECMD) tool vet .
 
-REGISTRY=pixiecore
-TAG=dev
-.PHONY: ci-push-images
-ci-push-images:
-	make -f Makefile.inc push GOARCH=amd64   TAG=$(TAG)-amd64   BINARY=pixiecore REGISTRY=$(REGISTRY)
-	make -f Makefile.inc push GOARCH=arm     TAG=$(TAG)-arm     BINARY=pixiecore REGISTRY=$(REGISTRY)
-	make -f Makefile.inc push GOARCH=arm64   TAG=$(TAG)-arm64   BINARY=pixiecore REGISTRY=$(REGISTRY)
-	make -f Makefile.inc push GOARCH=ppc64le TAG=$(TAG)-ppc64le BINARY=pixiecore REGISTRY=$(REGISTRY)
-	make -f Makefile.inc push GOARCH=s390x   TAG=$(TAG)-s390x   BINARY=pixiecore REGISTRY=$(REGISTRY)
-	manifest-tool push from-args --platforms linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x --template $(REGISTRY)/pixiecore:$(TAG)-ARCH --target $(REGISTRY)/pixiecore:$(TAG)
-
-.PHONY: ci-config
-ci-config:
-	(cd .circleci && go run gen-config.go >config.yml)
-
 .PHONY: update-ipxe
 update-ipxe:
 	# rm -rf third_party/ipxe

.gitignore

@@ -1,21 +1,3 @@
-# Netboot, packages and utilities for network booting
-
-This repository contains Go implementations of network protocols used
-in booting machines over the network, as well as utilites built on top
-of these libraries.
-
-**This project is no longer actively developed. I'm glad if you find it useful, but don't expect any significant changes.**
-
-## Programs
-
-- [Pixiecore](https://github.com/danderson/netboot/tree/master/pixiecore): Command line all-in-one tool for easy netbooting
-
-## Libraries
-
-The canonical import path for Go packages in this repository is `go.universe.tf/netboot`.
-
-- [pcap](https://godoc.org/go.universe.tf/netboot/pcap): Pure Go implementation of reading and writing pcap files.
-- [dhcp4](https://godoc.org/go.universe.tf/netboot/dhcp4): DHCPv4 library providing the low-level bits of a DHCP client/server (packet marshaling, RFC-compliant packet transmission semantics).
-- [tftp](https://godoc.org/go.universe.tf/netboot/tftp): Read-only TFTP server implementation.
-- [pixiecore](https://godoc.org/go.universe.tf/netboot/pixiecore): Go library for Pixiecore tool functionality. Every stability warning in this repository applies double for this package.
+# Pixiecore
 
+This project is a permanent fork of: [Pixiecore](https://github.com/danderson/netboot/tree/master/pixiecore)