kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Trying to install rootless docker to run fn tests

Browse Source
This commit is contained in:
Alexey Odinokov
2020-06-15 06:22:22 +00:00
parent 6e91e0667d
commit afc14afe45
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -4,8 +4,9 @@
# Makefile for kustomize CLI and API. # Makefile for kustomize CLI and API.
MYGOBIN := $(shell go env GOPATH)/bin MYGOBIN := $(shell go env GOPATH)/bin
MYDOCKERBIN := $(HOME)/bin
SHELL := /bin/bash SHELL := /bin/bash
export PATH := $(MYGOBIN):$(PATH) export PATH := $(MYGOBIN):$(MYDOCKERBIN):$(PATH)
.PHONY: all .PHONY: all
all: verify-kustomize all: verify-kustomize
@@ -194,9 +195,14 @@ lint-kustomize: install-tools $(builtinplugins)
build-kustomize-api: $(builtinplugins) build-kustomize-api: $(builtinplugins)
cd api; go build ./... cd api; go build ./...
# Using the approach from https://docs.docker.com/engine/security/rootless/#install
# pinning docker 19.03.11
$(MYDOCKERBIN)/docker:
curl -fsSL https://raw.githubusercontent.com/docker/docker-install/3d1b8a8/rootless-install.sh | sh
.PHONY: test-unit-kustomize-api .PHONY: test-unit-kustomize-api
test-unit-kustomize-api: build-kustomize-api test-unit-kustomize-api: build-kustomize-api $(MYDOCKERBIN)/docker
cd api; go test ./... -ldflags "-X sigs.k8s.io/kustomize/api/provenance.version=v444.333.222" cd api; DOCKER_HOST=unix://$(XDG_RUNTIME_DIR)/docker.sock go test ./... -ldflags "-X sigs.k8s.io/kustomize/api/provenance.version=v444.333.222"
.PHONY: test-unit-kustomize-plugins .PHONY: test-unit-kustomize-plugins
test-unit-kustomize-plugins: test-unit-kustomize-plugins:

5
api/krusty/fnplugin_test.go
View File

@@ -6,8 +6,7 @@ import (
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
) )
// TODO: enable when get docker installed before these tests start func TestFnGenerator(t *testing.T) {
func disabled_TestFnGenerator(t *testing.T) {
th := kusttest_test.MakeEnhancedHarness(t) th := kusttest_test.MakeEnhancedHarness(t)
defer th.Reset() defer th.Reset()
@@ -221,7 +220,7 @@ spec:
`) `)
} }
func disabled_TestFnTransformer(t *testing.T) { func TestFnTransformer(t *testing.T) {
th := kusttest_test.MakeEnhancedHarness(t) th := kusttest_test.MakeEnhancedHarness(t)
defer th.Reset() defer th.Reset()