Skip to content
Snippets Groups Projects
Commit b2ed622c authored by Jonas Leder's avatar Jonas Leder
Browse files

cleanup

parent f3bbe8fa
No related branches found
No related tags found
1 merge request!6switch to buildkit
Pipeline #53863 passed
package main
import (
"fmt"
"os"
"path/filepath"
"regexp"
"strings"
)
......@@ -49,46 +47,6 @@ func getArchitectures() string {
return strings.Join(prefixed, ",")
}
func getSingleArchImageName() string {
if os.Getenv("SINGLEARCH_IMAGE_NAME") == "" {
return "single-arch"
}
return os.Getenv("SINGLEARCH_IMAGE_NAME")
}
func getImageDigest() (string, error) {
filePath := "./image.txt"
content, err := os.ReadFile(filePath)
if err != nil {
return "", fmt.Errorf("failed to read file: %w", err)
}
err = os.Remove(filePath)
if err != nil {
return "", fmt.Errorf("failed to delete file: %w", err)
}
return strings.TrimSpace(string(content)), nil
}
func getManifestDigest() (string, error) {
filePath := "./manifest-digest.txt"
content, err := os.ReadFile(filePath)
if err != nil {
return "", fmt.Errorf("failed to read file: %w", err)
}
err = os.Remove(filePath)
if err != nil {
return "", fmt.Errorf("failed to delete file: %w", err)
}
re := regexp.MustCompile(`sha256:[a-f0-9]{64}`)
match := re.FindString(string(content))
return match, nil
}
func getAdditionalArgs() string {
return os.Getenv("BUILDKIT_ADDITIONAL_ARGS")
}
......@@ -15,7 +15,7 @@ func main() {
writeManifestDigest()
}
func buildImage() string {
func buildImage() {
buildCmd := fmt.Sprintf("buildctl --addr unix:///run/user/1000/buildkit/buildkitd.sock build --frontend=dockerfile.v0 --opt platform=%s --local context=\"$(pwd)\" --local dockerfile=%s --output type=image,name=%s:%s,push=true --metadata-file /tmp/build-metadata.json %s",
getArchitectures(),
getDockerfilePath(),
......@@ -24,12 +24,6 @@ func buildImage() string {
getAdditionalArgs())
fmt.Println("Assembled build command: ", buildCmd)
executeCmd(buildCmd)
imageDigest, err := getImageDigest()
if err != nil {
fmt.Println("Failed to get image digest for AMD64 platform")
os.Exit(1)
}
return imageDigest
}
func startupServices() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment