Skip to content

docker build if DockerImage target is a Dockerfile #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

docker build if DockerImage target is a Dockerfile #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5865fed
docker build if is a Dockerfile
Mar 8, 2023
16fbe39
added exec test with docker build
Mar 8, 2023
03ae2af
Delete vulcan_bis.yaml
eloymg Mar 14, 2023
6d4fed9
Delete Dockerfile_2
eloymg Mar 14, 2023
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
34 changes: 34 additions & 0 deletions pkg/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"net"
"os"
"os/exec"
"path/filepath"
"regexp"
"runtime"
"strconv"
Expand Down Expand Up @@ -347,6 +348,39 @@ func beforeCheckRun(params backend.RunParams, rc *docker.RunConfig,
// and the check can access it.
if params.AssetType == "DockerImage" {
rc.HostConfig.Binds = append(rc.HostConfig.Binds, "/var/run/docker.sock:/var/run/docker.sock")
// check if the target is a file and build if it is
_, err := os.Stat(params.Target)
if err == nil {
currentDirectory, err := os.Getwd()
if err != nil {
currentDirectory = ""
}
targetName := filepath.Base(currentDirectory) + "_" + strings.ReplaceAll(params.Target, "/", "_") + ":latest"
targetName = strings.ToLower(targetName)
log.Debugf("Building docker image from file=" + params.Target)
cmd := exec.Command("docker", "build", "-t", targetName, "-f", params.Target, ".")
var cmdOut bytes.Buffer
var stdErr bytes.Buffer
cmd.Stdout = &cmdOut
cmd.Stderr = &stdErr
err = cmd.Run()
if err != nil {
log.Errorf("Error building docker %v %v", err, cmdOut.String())
log.Debugf("Error:%v", stdErr.String())
log.Debugf("Docker image build with tag " + targetName)
} else {
log.Debugf("%v", stdErr.String())
check := getCheckByID(checks, params.CheckID)
if check == nil {
log.Errorf("check not found id=%s", params.CheckID)
return nil
}
newTarget = targetName
log.Debugf("swaping target=%s new=%s check=%s", params.Target, newTarget, params.CheckID)
check.NewTarget = newTarget
rc.ContainerConfig.Env = upsertEnv(rc.ContainerConfig.Env, backend.CheckTargetVar, newTarget)
}
}

// Some checks will fail because the reachability check as they
// expect remote urls. This will bypass the check
Expand Down
4 changes: 4 additions & 0 deletions script/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ echo "Test local docker image"
./vulcan-local -t path/vulcan-local:xxx -a DockerImage -i trivy
echo "exit=$?"

echo "Test build docker image from Dockerfile"
./vulcan-local -t Dockerfile -a DockerImage -i trivy
echo "exit=$?"

echo "Docker test based on yaml config"
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
-v "$PWD":/target -e TRAVIS_BUILD_DIR=/target \
Expand Down