Skip to content

Commit

Permalink
docker: use busybox
Browse files Browse the repository at this point in the history
  • Loading branch information
boz committed Aug 23, 2018
1 parent 9a46ee3 commit d1cb006
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Expand Up @@ -7,9 +7,8 @@ go:

sudo: required

before_install:
- sudo apt-get update -qq
- sudo apt-get install musl-tools -y
services:
- docker

install:
- make install-deps
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM alpine
FROM busybox:glibc

ADD ./kail-linux /kail

Expand Down
9 changes: 2 additions & 7 deletions Makefile
Expand Up @@ -3,12 +3,7 @@ DOCKER_IMAGE ?= kail
DOCKER_REPO ?= abozanich/$(DOCKER_IMAGE)
DOCKER_TAG ?= latest

ifeq ($(shell uname -s),Linux)
BUILD_ENV = CC=$(shell which musl-gcc)
LDFLAGS = -w -linkmode external -extldflags "-static"
else
BUILD_ENV = GOOS=linux GOARCH=amd64
endif
BUILD_ENV = GOOS=linux GOARCH=amd64

ifdef TRAVIS
LDFLAGS += -X main.version=$(TRAVIS_BRANCH) -X main.commit=$(TRAVIS_COMMIT)
Expand All @@ -23,7 +18,7 @@ build-linux:
test:
govendor test +local

test-full: build
test-full: build image
govendor test -v -race +local

image: build-linux
Expand Down

0 comments on commit d1cb006

Please sign in to comment.