Infrastructure/zot
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2025-03-11 02:17:43 -05:00
Code Issues Activity

stacker: fix stacker build

Browse source
This commit is contained in:
Ramkumar Chinchani 2020-07-09 00:10:11 -07:00
parent 2ac675e682
commit adc6859cd6
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -4,6 +4,7 @@ COMMIT_HASH=$(shell git describe --always --tags --long)
COMMIT=$(if $(shell git status --porcelain --untracked-files=no),$(COMMIT_HASH)-dirty,$(COMMIT_HASH)) COMMIT=$(if $(shell git status --porcelain --untracked-files=no),$(COMMIT_HASH)-dirty,$(COMMIT_HASH))
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker) CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
PATH := bin:$(PATH) PATH := bin:$(PATH)
TMPDIR := $(shell mktemp -d)
.PHONY: all .PHONY: all
all: doc binary debug test check all: doc binary debug test check
@ -53,7 +54,7 @@ binary-container:
.PHONY: binary-stacker .PHONY: binary-stacker
binary-stacker: binary-stacker:
stacker build --substitute PWD=$$PWD --no-cache stacker build --roots ${TMPDIR} --substitute PWD=$$PWD
.PHONY: image .PHONY: image
image: image:

12
pkg/storage/storage_test.go
View file

@ -503,7 +503,9 @@ func TestNegativeCases(t *testing.T) {
os.RemoveAll(dir) os.RemoveAll(dir)
So(storage.NewImageStore(dir, true, true, log.Logger{Logger: zerolog.New(os.Stdout)}), ShouldNotBeNil) So(storage.NewImageStore(dir, true, true, log.Logger{Logger: zerolog.New(os.Stdout)}), ShouldNotBeNil)
So(storage.NewImageStore("/deadBEEF", true, true, log.Logger{Logger: zerolog.New(os.Stdout)}), ShouldBeNil) if os.Geteuid() != 0 {
So(storage.NewImageStore("/deadBEEF", true, true, log.Logger{Logger: zerolog.New(os.Stdout)}), ShouldBeNil)
}
}) })
Convey("Invalid init repo", t, func(c C) { Convey("Invalid init repo", t, func(c C) {
@ -515,7 +517,9 @@ func TestNegativeCases(t *testing.T) {
il := storage.NewImageStore(dir, true, true, log.Logger{Logger: zerolog.New(os.Stdout)}) il := storage.NewImageStore(dir, true, true, log.Logger{Logger: zerolog.New(os.Stdout)})
err = os.Chmod(dir, 0000) // remove all perms err = os.Chmod(dir, 0000) // remove all perms
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(func() { _ = il.InitRepo("test") }, ShouldPanic) if os.Geteuid() != 0 {
So(func() { _ = il.InitRepo("test") }, ShouldPanic)
}
}) })
Convey("Invalid validate repo", t, func(c C) { Convey("Invalid validate repo", t, func(c C) {
@ -539,7 +543,9 @@ func TestNegativeCases(t *testing.T) {
So(err, ShouldNotBeNil) So(err, ShouldNotBeNil)
err = os.Chmod(dir, 0000) // remove all perms err = os.Chmod(dir, 0000) // remove all perms
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(func() { _, _ = il.ValidateRepo("test") }, ShouldPanic) if os.Geteuid() != 0 {
So(func() { _, _ = il.ValidateRepo("test") }, ShouldPanic)
}
os.RemoveAll(dir) os.RemoveAll(dir)
_, err = il.GetRepositories() _, err = il.GetRepositories()
So(err, ShouldNotBeNil) So(err, ShouldNotBeNil)

14
stacker.yaml
View file

@ -1,7 +1,7 @@
build: build:
from: from:
type: docker type: docker
url: docker://golang:1.12.8 url: docker://golang:1.14.4
binds: binds:
- ${{PWD}} -> /go/src/github.com/anuvu/zot - ${{PWD}} -> /go/src/github.com/anuvu/zot
run: | run: |
@ -11,6 +11,16 @@ build:
export PATH='/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' export PATH='/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
go get -u github.com/swaggo/swag/cmd/swag go get -u github.com/swaggo/swag/cmd/swag
cd /go/src/github.com/anuvu/zot cd /go/src/github.com/anuvu/zot
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.17.1 go get -u -v -d ./...
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.26.0
make make
build_only: true build_only: true
zot:
from:
type: docker
url: docker://centos:latest
import:
- ${{PWD}}/bin/zot
run: |
cp /stacker/zot /usr/bin/zot