Skip to content

Commit

Permalink
Removing debug targets and debug images; need different solution (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomikazi authored Apr 8, 2020
1 parent 9b706eb commit 8f2dd1b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 52 deletions.
11 changes: 2 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ export GO111MODULE=on
.PHONY: build

ONOS_CONTROL_VERSION := latest
ONOS_CONTROL_DEBUG_VERSION := debug
ONOS_BUILD_VERSION := stable

build: # @HELP build the Go binaries and run all validations (default)
build:
CGO_ENABLED=1 go build -o build/_output/onos-control ./cmd/onos
CGO_ENABLED=1 go build -gcflags "all=-N -l" -o build/_output/onos-control-debug ./cmd/onos-control
go build -o build/_output/onos ./cmd/onos

test: # @HELP run the unit tests and source code validation
Expand Down Expand Up @@ -52,11 +50,6 @@ onos-control-docker: onos-control-base-docker # @HELP build onos-control Docker
--build-arg ONOS_CONTROL_BASE_VERSION=${ONOS_CONTROL_VERSION} \
-t onosproject/onos-control:${ONOS_CONTROL_VERSION}

onos-control-debug-docker: onos-control-base-docker # @HELP build onos-control Docker debug image
docker build . -f build/onos-control-debug/Dockerfile \
--build-arg ONOS_CONTROL_BASE_VERSION=${ONOS_CONTROL_VERSION} \
-t onosproject/onos-control:${ONOS_CONTROL_DEBUG_VERSION}

onos-cli-docker: onos-control-base-docker # @HELP build onos-cli Docker image
docker build . -f build/onos-cli/Dockerfile \
--build-arg ONOS_CONTROL_BASE_VERSION=${ONOS_CONTROL_VERSION} \
Expand All @@ -76,12 +69,12 @@ integration: kind


images: # @HELP build all Docker images
images: build onos-control-docker onos-control-debug-docker
images: build onos-control-docker

kind: # @HELP build Docker images and add them to the currently configured kind cluster
kind: images
@if [ "`kind get clusters`" = '' ]; then echo "no kind cluster found" && exit 1; fi
kind load docker-image onosproject/onos-config:${ONOS_CONTROL_DEBUG_VERSION}
kind load docker-image onosproject/onos-config:${ONOS_CONTROL_VERSION}

all: build images

Expand Down
43 changes: 0 additions & 43 deletions build/onos-control-debug/Dockerfile

This file was deleted.

0 comments on commit 8f2dd1b

Please sign in to comment.