Skip to content

Commit

Permalink
remove squashlite stuff as it moved to its own repo
Browse files Browse the repository at this point in the history
  • Loading branch information
yuval-k committed Jul 19, 2018
1 parent 6fd412b commit 29fe964
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 48 deletions.
2 changes: 1 addition & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,6 @@
branch = "master"
name = "github.com/vishvananda/netlink"

#[[constraint]]
# branch = "master"
# name = "golang.org/x/net"

[[constraint]]
name = "google.golang.org/grpc"
version = "1.5.1"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.10.0"
Expand Down
37 changes: 1 addition & 36 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
all: binaries deployment

.PHONY: binaries
binaries: target/squash-server/squash-server target/squash-client/squash-client target/squash target/squash-lite-container/squash-lite-container target/squash-lite
binaries: target/squash-server/squash-server target/squash-client/squash-client target/squash

.PHONY: release-binaries
release-binaries: target/squash-server/squash-server target/squash-client/squash-client target/squash-linux target/squash-osx target/squash-windows
Expand All @@ -25,9 +25,6 @@ target:
target/squash: target $(SRCS)
go build -o $@ ./cmd/squash-cli

target/squash-lite: target $(SRCS)
go build -ldflags "-X github.com/solo-io/squash/pkg/lite/kube.ImageVersion=$(VERSION) -X github.com/solo-io/squash/pkg/lite/kube.ImageRepo=$(DOCKER_REPO)" -o $@ ./cmd/squash-lite

target/squash-linux: target $(SRCS)
GOOS=linux go build -o $@ ./cmd/squash-cli

Expand Down Expand Up @@ -67,38 +64,6 @@ target/squash-server-container: ./target/squash-server/squash-server target/squa
docker build -t $(DOCKER_REPO)/squash-server:$(VERSION) ./target/squash-server/
touch $@

target/squash-lite-container/:
[ -d $@ ] || mkdir -p $@

target/squash-lite-container/squash-lite-container: | target/squash-lite-container/
target/squash-lite-container/squash-lite-container: $(SRCS)
GOOS=linux CGO_ENABLED=0 go build -ldflags '-w' -o ./target/squash-lite-container/squash-lite-container ./cmd/squash-lite-container/


target/squash-lite-container/Dockerfile.dlv: | target/squash-lite-container/
target/squash-lite-container/Dockerfile.dlv: cmd/squash-lite-container/Dockerfile.dlv
cp cmd/squash-lite-container/Dockerfile.dlv target/squash-lite-container/Dockerfile.dlv
target/squash-lite-container-dlv-container: ./target/squash-lite-container/squash-lite-container target/squash-lite-container/Dockerfile.dlv
docker build -f target/squash-lite-container/Dockerfile.dlv -t $(DOCKER_REPO)/squash-lite-container-dlv:$(VERSION) ./target/squash-lite-container/
touch $@
target/squash-lite-container-dlv-pushed: target/squash-lite-container-dlv-container
docker push $(DOCKER_REPO)/squash-lite-container-dlv:$(VERSION)
touch $@



target/squash-lite-container/Dockerfile.gdb: | target/squash-lite-container/
target/squash-lite-container/Dockerfile.gdb: cmd/squash-lite-container/Dockerfile.gdb
cp cmd/squash-lite-container/Dockerfile.gdb target/squash-lite-container/Dockerfile.gdb
target/squash-lite-container-gdb-container: ./target/squash-lite-container/squash-lite-container target/squash-lite-container/Dockerfile.gdb
docker build -f target/squash-lite-container/Dockerfile.gdb -t $(DOCKER_REPO)/squash-lite-container-gdb:$(VERSION) ./target/squash-lite-container/
touch $@
target/squash-lite-container-gdb-pushed: target/squash-lite-container-gdb-container
docker push $(DOCKER_REPO)/squash-lite-container-gdb:$(VERSION)
touch $@



target/squash-client-container: target/squash-client/squash-client target/squash-client/Dockerfile
docker build -t $(DOCKER_REPO)/squash-client:$(VERSION) ./target/squash-client/
touch $@
Expand Down
3 changes: 0 additions & 3 deletions test/e2e/session_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ import (
"strings"
"time"

// . "github.com/solo-io/squash/test/e2e"
v1 "k8s.io/api/core/v1"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/solo-io/squash/test/utils"
Expand Down

0 comments on commit 29fe964

Please sign in to comment.