diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2ddec516e..2e5987f1b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,7 +39,6 @@ jobs: docker_channel: stable - uses: actions/checkout@v1 with: - fetch-depth: 2 path: src/github.com/goharbor/harbor - name: setup env run: | @@ -100,7 +99,6 @@ jobs: docker_channel: stable - uses: actions/checkout@v1 with: - fetch-depth: 2 path: src/github.com/goharbor/harbor - name: setup env run: | @@ -154,7 +152,6 @@ jobs: docker_channel: stable - uses: actions/checkout@v1 with: - fetch-depth: 2 path: src/github.com/goharbor/harbor - name: setup env run: | @@ -208,7 +205,6 @@ jobs: docker_channel: stable - uses: actions/checkout@v1 with: - fetch-depth: 2 path: src/github.com/goharbor/harbor - name: setup env run: | @@ -252,7 +248,6 @@ jobs: node-version: '10.16.2' - uses: actions/checkout@v1 with: - fetch-depth: 2 path: src/github.com/goharbor/harbor - name: setup env run: | diff --git a/Makefile b/Makefile index c3998f4f5..b7f5afd75 100644 --- a/Makefile +++ b/Makefile @@ -374,6 +374,12 @@ build_base_docker: $(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) goharbor/harbor-$$name-base:$(BASEIMAGETAG) $(REGISTRYUSER) $(REGISTRYPASSWORD) ; \ 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 package_online: update_prepare_version diff --git a/make/photon/prepare/Dockerfile.base b/make/photon/prepare/Dockerfile.base index 5c6840768..c8a1f6bf5 100644 --- a/make/photon/prepare/Dockerfile.base +++ b/make/photon/prepare/Dockerfile.base @@ -1,6 +1,4 @@ FROM photon:2.0 -RUN tdnf install -y python3 python3-pip httpd -RUN pip3 install pipenv==2018.11.26 - - +RUN tdnf install -y python3 python3-pip httpd && tdnf clean all +RUN pip3 install setuptools && pip3 install pipenv==2018.11.26 diff --git a/make/photon/redis/Dockerfile.base b/make/photon/redis/Dockerfile.base index c670d7482..d800f6a91 100644 --- a/make/photon/redis/Dockerfile.base +++ b/make/photon/redis/Dockerfile.base @@ -1,3 +1,3 @@ FROM photon:2.0 -RUN tdnf install -y redis sudo +RUN tdnf install -y redis sudo && tdnf clean all diff --git a/tests/travis/ut_run.sh b/tests/travis/ut_run.sh index f835b3e63..70860c952 100755 --- a/tests/travis/ut_run.sh +++ b/tests/travis/ut_run.sh @@ -17,4 +17,4 @@ docker ps DIR="$(cd "$(dirname "$0")" && pwd)" go test -race -i ./src/core ./src/jobservice sudo -E env "PATH=$PATH" "POSTGRES_MIGRATION_SCRIPTS_PATH=$DIR/../../make/migrations/postgresql/" ./tests/coverage4gotest.sh -goveralls -coverprofile=profile.cov -service=github || true \ No newline at end of file +#goveralls -coverprofile=profile.cov -service=github || true \ No newline at end of file