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

[WIP] Utilized public fossa-analyzer image #612

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[WIP] Utilized public fossa-analyzer image #612

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ff2b15
Utilized public fossa-analyzer image
zelahi Sep 13, 2019
29f8fee
Removed Fossa api key from Jenkinsfile call
zelahi Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Jenkinsfile.baguette
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,11 @@ pipeline {
}
steps {
withCredentials([
usernamePassword(credentialsId: 'dockerbuildbot-hub.docker.com', usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWORD'),
string(credentialsId: 'fossa-api-key', variable: 'FOSSA_API_KEY')
]) {
dir('src/github.com/docker/app') {
checkout scm
ansiColor('xterm') {
sh "docker login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWORD"
sh "FOSSA_API_KEY=$FOSSA_API_KEY BRANCH_NAME='${BRANCH_NAME}' make fossa-analyze"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unnecessary. withCredentials already expose FOSSA_API_KEY environment variable

sh "FOSSA_API_KEY=$FOSSA_API_KEY make fossa-test"
}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ fossa-test:
docker run -i --rm -e FOSSA_API_KEY=$(FOSSA_API_KEY) \
-v $(CURDIR)/$*:/go/src/github.com/docker/app \
-w /go/src/github.com/docker/app \
$(BUILD_ANALYZER) test --debug
$(BUILD_ANALYZER) test

clean: ## clean build artifacts
$(call rmdir,bin)
Expand Down
2 changes: 1 addition & 1 deletion vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BIN_STANDALONE_NAME := ${BIN_NAME}-standalone
E2E_NAME := $(BIN_NAME)-e2e

# Variables for fossa scan
BUILD_ANALYZER?=dockereng/fossa-analyzer
BUILD_ANALYZER?=docker/fossa-analyzer
FOSSA_OPTS?=--option all-tags:true --option allow-unresolved:true

# Enable experimental features. "on" or "off"
Expand Down