Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 6c39340

Browse files
authored
Merge pull request #772 from eunomie/rm-fossa
remove fossa scan
2 parents dc6d86d + 89619eb commit 6c39340

File tree

4 files changed

+0
-61
lines changed

4 files changed

+0
-61
lines changed

.fossa.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

Jenkinsfile.baguette

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,32 +57,6 @@ pipeline {
5757
}
5858
}
5959
}
60-
stage("License Scan") {
61-
when {
62-
anyOf {
63-
changeset "Gopkg.lock"
64-
branch "master"
65-
}
66-
}
67-
agent {
68-
label 'ubuntu-1604-aufs-edge'
69-
}
70-
steps {
71-
withCredentials([
72-
usernamePassword(credentialsId: 'dockerbuildbot-hub.docker.com', usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWORD'),
73-
string(credentialsId: 'fossa-api-key', variable: 'FOSSA_API_KEY')
74-
]) {
75-
dir('src/github.com/docker/app') {
76-
checkout scm
77-
ansiColor('xterm') {
78-
sh 'echo "${REGISTRY_PASSWORD}" | docker login -u "${REGISTRY_USERNAME}" --password-stdin'
79-
sh "FOSSA_API_KEY=$FOSSA_API_KEY BRANCH_NAME='${BRANCH_NAME}' make fossa-analyze"
80-
sh "FOSSA_API_KEY=$FOSSA_API_KEY make fossa-test"
81-
}
82-
}
83-
}
84-
}
85-
}
8660
stage('Invocation image'){
8761
agent {
8862
label 'ubuntu-1804'

Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,6 @@ coverage: coverage-test-unit coverage-test-e2e ## run tests with coverage
104104
go tool cover -func _build/cov/all.out
105105
go tool cover -html _build/cov/all.out -o _build/cov/coverage.html
106106

107-
fossa-analyze:
108-
docker run -i --rm -e FOSSA_API_KEY \
109-
-e GO111MODULE=off \
110-
-v $(CURDIR)/$*:/go/src/github.com/docker/app \
111-
-w /go/src/github.com/docker/app \
112-
$(BUILD_ANALYZER) analyze $(FOSSA_OPTS) --branch $(BRANCH_NAME)
113-
114-
fossa-test:
115-
docker run -i --rm -e FOSSA_API_KEY \
116-
-v $(CURDIR)/$*:/go/src/github.com/docker/app \
117-
-w /go/src/github.com/docker/app \
118-
$(BUILD_ANALYZER) test --debug
119-
120107
clean: ## clean build artifacts
121108
$(call rmdir,bin)
122109
$(call rmdir,_build)

vars.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ PKG_NAME := github.com/docker/app
22
BIN_NAME ?= docker-app
33
E2E_NAME := $(BIN_NAME)-e2e
44

5-
# Variables for fossa scan
6-
BUILD_ANALYZER?=dockereng/fossa-analyzer:1.0.10
7-
FOSSA_OPTS?=--option all-tags:true --option allow-unresolved:true
8-
95
ALPINE_VERSION=3.10.3
106

117
# Failing to resolve sh.exe to a full path denotes a windows vanilla shell.

0 commit comments

Comments
 (0)