go/golang-saas-starter-kit
1
0
Fork 0
mirror of https://github.com/raseels-repos/golang-saas-starter-kit.git synced 2025-08-10 22:41:25 +02:00
Code Issues Releases Activity

updated devops tool to use scratch image for cache

Browse Source
This commit is contained in:
Lee Brown
2019-08-06 19:40:11 -08:00
parent 17ed09708c
commit 3bb152a146
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/devops/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM golang:1.12.6-alpine3.9 FROM golang:1.12.6-alpine3.9 AS builder
LABEL maintainer="lee@geeksinthewoods.com" LABEL maintainer="lee@geeksinthewoods.com"
@@ -19,6 +19,10 @@ COPY tools/devops ./tools/devops
WORKDIR ./tools/devops WORKDIR ./tools/devops
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o /devops . RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o /go/bin/devops .
ENTRYPOINT ["/devops"] FROM scratch
COPY --from=builder /go/bin/devops /go/bin/devops
ENTRYPOINT ["/go/bin/devops"]

11
tools/devops/cmd/cicd/service_build.go
View File

@@ -291,7 +291,7 @@ func ServiceBuild(log *log.Logger, req *serviceBuildRequest) error {
buildBaseImage = req.ProjectName + ":" + req.Env + "-" + req.ServiceName + "-" + buildBaseImageTag buildBaseImage = req.ProjectName + ":" + req.Env + "-" + req.ServiceName + "-" + buildBaseImageTag
} }
cmds = append(cmds, []string{"docker", "pull", buildBaseImageTag}) cmds = append(cmds, []string{"docker", "pull", buildBaseImage})
cmds = append(cmds, []string{ cmds = append(cmds, []string{
"docker", "build", "docker", "build",
@@ -337,7 +337,14 @@ func ServiceBuild(log *log.Logger, req *serviceBuildRequest) error {
} }
for _, cmd := range cmds { for _, cmd := range cmds {
log.Printf("\t\t%s\n", strings.Join(cmd, " ")) var logCmd string
if len(cmd) >= 2 && cmd[1] == "login" {
logCmd = strings.Join(cmd[0:2], " ")
} else {
logCmd = strings.Join(cmd, " ")
}
log.Printf("\t\t%s\n", logCmd)
err = execCmds(log, req.ProjectRoot, cmd) err = execCmds(log, req.ProjectRoot, cmd)
if err != nil { if err != nil {

2
tools/devops/scripts/build.sh
View File

@@ -20,5 +20,5 @@ if [[ $doPush == 1 ]]; then
docker push ${releaseImg} docker push ${releaseImg}
fi fi
docker run --rm --entrypoint=cat ${releaseImg} /devops > devops docker run --rm --entrypoint=cat ${releaseImg} /go/bin/devops > devops
chmod +x devops chmod +x devops