Skip to content

Commit c014fb5

Browse files
committed
another try
1 parent 83f26a0 commit c014fb5

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ language: java
33
services:
44
- docker
55

6+
go:
7+
- "1.10"
8+
69
# skip install step
710
install: true
811

Makefile

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
IMAGE?=radanalyticsio/spark-operator
1+
IMAGE ?= radanalyticsio/spark-operator
2+
GO_BIN := $(shell which go)
23

34
.PHONY: build
45
build: package image-build
@@ -21,17 +22,27 @@ buildah:
2122
command -v buildah || docker cp $$(docker create docker.io/tomkukral/buildah:latest ls):/usr/bin/buildah ./buildah
2223
echo -e "\n\nbuildah version: " && ./buildah -v || ./buildah -v && echo -e "\n"
2324
buildah bud -f Dockerfile.centos . /dev/null || ./buildah bud -f Dockerfile.centos .
24-
#buildah bud -f Dockerfile.alpine . /dev/null || ./buildah bud -f Dockerfile.alpine . # this fails for the alpine img
25+
buildah bud -f Dockerfile.alpine . /dev/null || ./buildah bud -f Dockerfile.alpine .
26+
27+
blabla:
28+
sudo touch $(shell type -P go)"-foo"
2529

2630
.PHONY: buildah-travis-deps
2731
buildah-travis-deps:
32+
echo -e "travis_fold:start:buildah-deps\033[33;1mInstalling Buildah and its dependencies\033[0m"
33+
sudo cp $(GO_BIN) $(GO_BIN)_bak && sudo apt-get update && sudo apt-get -y install golang-1.10-go && sudo cp /usr/lib/go-1.10/bin/go $(GO_BIN) && go version
34+
git clone https://github.com/containers/buildah ${GOPATH}/src/github.com/containers/buildah
35+
cd ${GOPATH}/src/github.com/containers/buildah && sudo make install.libseccomp.sudo
36+
sudo cp $(GO_BIN)_bak $(GO_BIN) && go version
37+
cd ${GOPATH}/src/github.com/containers/buildah && make runc all TAGS="apparmor seccomp" && sudo make install install.runc
38+
echo -e "\ntravis_fold:end:buildah-deps\r"
2839
#sudo apt-get -y install software-properties-common
29-
sudo add-apt-repository -y ppa:alexlarsson/flatpak
40+
#sudo add-apt-repository -y ppa:alexlarsson/flatpak
3041
#sudo add-apt-repository -y ppa:gophers/archive
31-
sudo apt-add-repository -y ppa:projectatomic/ppa
32-
sudo apt-get -y -qq update
42+
#sudo apt-add-repository -y ppa:projectatomic/ppa
43+
#sudo apt-get -y -qq update
3344
#sudo apt-get -y install bats btrfs-tools git libapparmor-dev libdevmapper-dev libglib2.0-dev libgpgme11-dev libostree-dev libseccomp-dev libselinux1-dev skopeo-containers go-md2man
34-
sudo apt-get -y install libostree-dev libostree-1-1
45+
#sudo apt-get -y install libostree-dev libostree-1-1
3546
#sudo apt-get -y install golang-1.10
3647

3748
.PHONY: image-build-alpine

0 commit comments

Comments
 (0)