Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 02:05:41 +01:00
Code Issues Projects Releases Wiki Activity

feat(cicd) fix some build problem

Browse Source 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
This commit is contained in:
Ziming Zhang 2020-02-20 20:25:58 +08:00
parent aa71fc43cf
commit 94230b5e19
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/CI.yml vendored
View File

@ -39,7 +39,6 @@ jobs:
docker_channel: stable docker_channel: stable
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |
@ -100,7 +99,6 @@ jobs:
docker_channel: stable docker_channel: stable
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |
@ -154,7 +152,6 @@ jobs:
docker_channel: stable docker_channel: stable
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |
@ -208,7 +205,6 @@ jobs:
docker_channel: stable docker_channel: stable
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |
@ -252,7 +248,6 @@ jobs:
node-version: '10.16.2' node-version: '10.16.2'
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |

6
Makefile
View File

@ -374,6 +374,12 @@ build_base_docker:
$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) goharbor/harbor-$$name-base:$(BASEIMAGETAG) $(REGISTRYUSER) $(REGISTRYPASSWORD) ; \ $(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) goharbor/harbor-$$name-base:$(BASEIMAGETAG) $(REGISTRYUSER) $(REGISTRYPASSWORD) ; \
done done
pull_base_docker:
@for name in chartserver clair clair-adapter core db jobservice log nginx notary-server notary-signer portal prepare redis registry registryctl; do \
echo $$name ; \
$(DOCKERPULL) goharbor/harbor-$$name-base:$(BASEIMAGETAG) ; \
done
install: compile build prepare start install: compile build prepare start
package_online: update_prepare_version package_online: update_prepare_version

6
make/photon/prepare/Dockerfile.base
View File

@ -1,6 +1,4 @@
FROM photon:2.0 FROM photon:2.0
RUN tdnf install -y python3 python3-pip httpd RUN tdnf install -y python3 python3-pip httpd && tdnf clean all
RUN pip3 install pipenv==2018.11.26 RUN pip3 install setuptools && pip3 install pipenv==2018.11.26

2
make/photon/redis/Dockerfile.base
View File

@ -1,3 +1,3 @@
FROM photon:2.0 FROM photon:2.0
RUN tdnf install -y redis sudo RUN tdnf install -y redis sudo && tdnf clean all

2
tests/travis/ut_run.sh
View File

@ -17,4 +17,4 @@ docker ps
DIR="$(cd "$(dirname "$0")" && pwd)" DIR="$(cd "$(dirname "$0")" && pwd)"
go test -race -i ./src/core ./src/jobservice go test -race -i ./src/core ./src/jobservice
sudo -E env "PATH=$PATH" "POSTGRES_MIGRATION_SCRIPTS_PATH=$DIR/../../make/migrations/postgresql/" ./tests/coverage4gotest.sh sudo -E env "PATH=$PATH" "POSTGRES_MIGRATION_SCRIPTS_PATH=$DIR/../../make/migrations/postgresql/" ./tests/coverage4gotest.sh
goveralls -coverprofile=profile.cov -service=github || true #goveralls -coverprofile=profile.cov -service=github || true