mirror of
https://github.com/goharbor/harbor
synced 2024-09-20 10:25:31 +00:00
debug trivy
try 1.20.5 Signed-off-by: yminer <yminer@vmware.com> update to 1.20.5 build golang image 1.20.5 based on photon Signed-off-by: yminer <yminer@vmware.com> add build_golang in api_common_install.sh for apitest_ldap add build_golang for go_check pass golang build arg
This commit is contained in:
parent
da0ab7da20
commit
2dcb9d5bcc
10
.github/workflows/CI.yml
vendored
10
.github/workflows/CI.yml
vendored
|
@ -44,7 +44,7 @@ jobs:
|
|||
- name: Set up Go 1.20
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: 1.20.6
|
||||
go-version: 1.20.5
|
||||
id: go
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
|
@ -105,7 +105,7 @@ jobs:
|
|||
- name: Set up Go 1.20
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: 1.20.6
|
||||
go-version: 1.20.5
|
||||
id: go
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
|
@ -160,7 +160,7 @@ jobs:
|
|||
- name: Set up Go 1.20
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: 1.20.6
|
||||
go-version: 1.20.5
|
||||
id: go
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
|
@ -215,7 +215,7 @@ jobs:
|
|||
- name: Set up Go 1.20
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: 1.20.6
|
||||
go-version: 1.20.5
|
||||
id: go
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
|
@ -268,7 +268,7 @@ jobs:
|
|||
- name: Set up Go 1.20
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: 1.20.6
|
||||
go-version: 1.20.5
|
||||
id: go
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
|
|
2
.github/workflows/build-package.yml
vendored
2
.github/workflows/build-package.yml
vendored
|
@ -26,7 +26,7 @@ jobs:
|
|||
- name: Set up Go 1.20
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: 1.20.6
|
||||
go-version: 1.20.5
|
||||
id: go
|
||||
- name: Setup Docker
|
||||
uses: docker-practice/actions-setup-docker@master
|
||||
|
|
2
.github/workflows/conformance_test.yml
vendored
2
.github/workflows/conformance_test.yml
vendored
|
@ -28,7 +28,7 @@ jobs:
|
|||
- name: Set up Go 1.20
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: 1.20.6
|
||||
go-version: 1.20.5
|
||||
id: go
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
|
|
|
@ -165,8 +165,8 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
|
|||
| 2.5 | 1.17.7 |
|
||||
| 2.6 | 1.18.6 |
|
||||
| 2.7 | 1.19.4 |
|
||||
| 2.8 | 1.20.6 |
|
||||
| 2.6 | 1.20.6 |
|
||||
| 2.8 | 1.20.5 |
|
||||
| 2.9 | 1.20.5 |
|
||||
|
||||
Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.
|
||||
|
||||
|
|
12
Makefile
12
Makefile
|
@ -140,7 +140,8 @@ GOINSTALL=$(GOCMD) install
|
|||
GOTEST=$(GOCMD) test
|
||||
GODEP=$(GOTEST) -i
|
||||
GOFMT=gofmt -w
|
||||
GOBUILDIMAGE=golang:1.20.6
|
||||
GOVERSION=1.20.5-dev
|
||||
GOBUILDIMAGE=goharbor/golang:$(GOVERSION)
|
||||
GOBUILDPATHINCONTAINER=/harbor
|
||||
|
||||
# go build
|
||||
|
@ -438,7 +439,7 @@ package_online: update_prepare_version
|
|||
@rm -rf $(HARBORPKG)
|
||||
@echo "Done."
|
||||
|
||||
package_offline: update_prepare_version compile build
|
||||
package_offline: build_golang update_prepare_version compile build
|
||||
|
||||
@echo "packing offline package ..."
|
||||
@cp -r make $(HARBORPKG)
|
||||
|
@ -452,6 +453,11 @@ package_offline: update_prepare_version compile build
|
|||
@rm -rf $(HARBORPKG)
|
||||
@echo "Done."
|
||||
|
||||
build_golang:
|
||||
@echo "build goharbor/golang image"
|
||||
$(DOCKERBUILD) --build-arg GOVERSION=$(GOVERSION) -f $(MAKEPATH)/photon/golang/Dockerfile -t $(GOBUILDIMAGE) .
|
||||
@echo "Done."
|
||||
|
||||
gosec:
|
||||
#go get github.com/securego/gosec/cmd/gosec
|
||||
#go get github.com/dghubble/sling
|
||||
|
@ -462,7 +468,7 @@ gosec:
|
|||
$(GOPATH)/bin/gosec -fmt=json -out=harbor_gas_output.json -quiet ./... | true ; \
|
||||
fi
|
||||
|
||||
go_check: gen_apis mocks_check misspell commentfmt lint
|
||||
go_check: build_golang gen_apis mocks_check misspell commentfmt lint
|
||||
|
||||
commentfmt:
|
||||
@echo checking comment format...
|
||||
|
|
19
make/photon/golang/Dockerfile
Normal file
19
make/photon/golang/Dockerfile
Normal file
|
@ -0,0 +1,19 @@
|
|||
FROM photon:4.0
|
||||
|
||||
ARG GOVERSION
|
||||
|
||||
ENV PATH /usr/local/go/bin:$PATH
|
||||
|
||||
ENV GOLANG_VERSION ${GOVERSION}
|
||||
|
||||
RUN set eux; \
|
||||
url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \
|
||||
wget -O go.tgz "$url"; \
|
||||
tar -C /usr/local -xzf go.tgz; \
|
||||
rm go.tgz; \
|
||||
go version
|
||||
|
||||
ENV GOPATH /go
|
||||
ENV PATH $GOPATH/bin:$PATH
|
||||
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 1777 "$GOPATH"
|
||||
WORKDIR $GOPATH
|
|
@ -1,4 +1,6 @@
|
|||
FROM golang:1.20.6
|
||||
FROM goharbor/golang:1.20.5-dev
|
||||
|
||||
RUN tdnf install make -y
|
||||
|
||||
ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
|
||||
ENV BUILDTAGS include_oss include_gcs
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM golang:1.20.6
|
||||
FROM goharbor/golang:1.20.5-dev
|
||||
|
||||
ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/
|
||||
WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/
|
||||
|
|
|
@ -19,7 +19,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX)
|
|||
git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP
|
||||
cd $TEMP; git checkout $VERSION; cd -
|
||||
|
||||
echo "Building Trivy adapter binary based on golang:1.20.6..."
|
||||
echo "Building Trivy adapter binary based on golang:1.20.5..."
|
||||
cp Dockerfile.binary $TEMP
|
||||
docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ then
|
|||
sed "s/# github_token: xxx/github_token: $GITHUB_TOKEN/" -i make/harbor.yml
|
||||
fi
|
||||
|
||||
sudo make compile build prepare COMPILETAG=compile_golangimage GOBUILDTAGS="include_oss include_gcs" TRIVYFLAG=true GEN_TLS=true PULL_BASE_FROM_DOCKERHUB=false
|
||||
sudo make build_golang compile build prepare COMPILETAG=compile_golangimage GOBUILDTAGS="include_oss include_gcs" TRIVYFLAG=true GEN_TLS=true PULL_BASE_FROM_DOCKERHUB=false
|
||||
|
||||
# set the debugging env
|
||||
echo "GC_TIME_WINDOW_HOURS=0" | sudo tee -a ./make/common/config/core/env
|
||||
|
|
|
@ -3,5 +3,5 @@ set -x
|
|||
|
||||
set -e
|
||||
|
||||
sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.20.6 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false
|
||||
sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.20.6 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false
|
||||
sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=goharbor/golang:1.20.5-dev COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false
|
||||
sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=goharbor/golang:1.20.5-dev COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
ARG GOLANG
|
||||
FROM ${GOLANG}
|
||||
|
||||
RUN tdnf install libstdc++ -y
|
||||
|
||||
ARG SPECTRAL_VERSION
|
||||
RUN curl -fsSL -o /usr/bin/spectral https://github.com/stoplightio/spectral/releases/download/$SPECTRAL_VERSION/spectral-linux && chmod +x /usr/bin/spectral
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user