Fix anchore scan for pull requests #53
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,8 @@ | ||
| **/.git | ||
| **/.gitignore | ||
| **/.DS_Store | ||
| **/*.tmp | ||
| .github | ||
| .dockerignore | ||
| Dockerfile | ||
| Dockerfile.* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,79 +1,89 @@ | ||
| # Used for local manual test builds | ||
|
|
||
| ###### | ||
| ## Stage 1: Build application with Go's build tools | ||
| ###### | ||
| FROM docker.io/library/golang:alpine as build | ||
|
|
||
| # Add build dependencies (gcc, c stdlib) | ||
| RUN apk add --no-cache build-base | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| # Cache build dependencies | ||
| COPY go.mod go.sum ./ | ||
| RUN go mod download | ||
|
|
||
| COPY . . | ||
|
|
||
| # Set build-time variables | ||
| ARG GOOS=linux | ||
|
|
||
| RUN : \ | ||
| && go version \ | ||
| && go test ./... | ||
|
|
||
| # Build plugins and threagile | ||
| RUN : \ | ||
| && go build -a -trimpath -ldflags="-s -w -X main.buildTimestamp=$(date '+%Y%m%d%H%M%S')" -buildmode=plugin -o raa.so raa/raa/raa.go \ | ||
| && go build -a -trimpath -ldflags="-s -w -X main.buildTimestamp=$(date '+%Y%m%d%H%M%S')" -buildmode=plugin -o dummy.so raa/dummy/dummy.go \ | ||
| && go build -a -trimpath -ldflags="-s -w -X main.buildTimestamp=$(date '+%Y%m%d%H%M%S')" -buildmode=plugin -o demo-rule.so risks/custom/demo/demo-rule.go \ | ||
| && go build -a -trimpath -ldflags="-s -w -X main.buildTimestamp=$(date '+%Y%m%d%H%M%S')" -o threagile | ||
|
|
||
| # Copy files in build image to simplify copy instruction | ||
| RUN : \ | ||
| && cp /app/demo/example/threagile.yaml /app/demo/example/threagile-example-model.yaml \ | ||
| && cp /app/demo/stub/threagile.yaml /app/demo/stub/threagile-stub-model.yaml | ||
|
|
||
|
|
||
| ###### | ||
| ## Stage 2: Make final small image | ||
| ###### | ||
| FROM docker.io/library/alpine:latest | ||
|
|
||
| # Label used in other scripts to filter | ||
| LABEL type="threagile" | ||
|
|
||
| RUN apk add --no-cache \ | ||
| ca-certificates \ | ||
| graphviz \ | ||
| ttf-freefont | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| # Add non-privileged user for running threagile | ||
| RUN adduser \ | ||
|
There was a problem hiding this comment. Kudos for adding best security practices for the project which is about improving security ;) |
||
| --disabled-password \ | ||
| --gecos "" \ | ||
| --home "$(pwd)" \ | ||
| --no-create-home \ | ||
| threagile | ||
|
|
||
| # Copy necessary files from build image | ||
| COPY --from=build \ | ||
| /app/raa.so \ | ||
| /app/dummy.so \ | ||
| /app/demo-rule.so \ | ||
| /app/demo/example/threagile-example-model.yaml \ | ||
| /app/demo/stub/threagile-stub-model.yaml \ | ||
| /app/LICENSE.txt \ | ||
| /app/report/template/background.pdf \ | ||
| /app/support/ \ | ||
| /app/threagile \ | ||
| /app/ | ||
|
|
||
| COPY --from=build \ | ||
| /app/server \ | ||
| /app/server | ||
|
|
||
| RUN : \ | ||
| && mkdir /data \ | ||
| && chown -R threagile:threagile /app /data | ||
|
|
||
| USER threagile | ||
|
|
||
| ENV PATH="${PATH}:/app" \ | ||
| GIN_MODE=release | ||
|
|
||
| ENTRYPOINT ["/app/threagile"] | ||
| CMD ["-help"] | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be nice to know the context why adding libc6-compat (
RUN apk add libc6-compat) was removed. As far as I can see that was a workaround, is adding everything withing oneRUN apk addfixing the problem and how?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I changed the building step to run in
golang:alpineinstead of the defaultgolang(which is based on Debian). Because of this we do not needlibc6-compatas a compatibility layer for glibc anymore.