Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-03 06:28:06 +01:00
Code Issues Projects Releases Wiki Activity

Update for harbor UI builder image.

Browse Source
This commit is contained in:
kunw 2017-04-26 16:00:18 +08:00
parent 1d98212d60
commit eddde3c804
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -97,7 +97,7 @@ script:
- docker-compose -f make/docker-compose.test.yml down - docker-compose -f make/docker-compose.test.yml down
- sudo rm -rf /data/config/* - sudo rm -rf /data/config/*
- ls /data/cert - ls /data/cert
- sudo make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.0 NOTARYFLAG=true - sudo make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.1 NOTARYFLAG=true
- docker ps - docker ps
- ./tests/notarytest.sh - ./tests/notarytest.sh

2
Makefile
View File

@ -91,7 +91,7 @@ NEWCLARITYVERSION=
#clarity parameters #clarity parameters
CLARITYIMAGE=vmware/harbor-clarity-ui-builder[:tag] CLARITYIMAGE=vmware/harbor-clarity-ui-builder[:tag]
CLARITYSEEDPATH=/clarity-seed CLARITYSEEDPATH=/harbor_ui
CLARITYBUILDSCRIPT=/entrypoint.sh CLARITYBUILDSCRIPT=/entrypoint.sh
# docker parameters # docker parameters

20
make/dev/nodeclarity/Dockerfile
View File

@ -1,20 +1,20 @@
FROM node:7.5.0 FROM node:7.5.0
RUN mkdir -p /clarity-seed RUN mkdir -p /harbor_ui
COPY src/ui_ng/package.json /clarity-seed COPY src/ui_ng/package.json /harbor_ui
COPY src/ui_ng/tslint.json /clarity-seed COPY src/ui_ng/tslint.json /harbor_ui
COPY src/ui_ng/typings.json /clarity-seed COPY src/ui_ng/typings.json /harbor_ui
COPY src/ui_ng/yarn.lock /clarity-seed COPY src/ui_ng/yarn.lock /harbor_ui
COPY make/dev/nodeclarity/angular-cli.json /clarity-seed COPY make/dev/nodeclarity/angular-cli.json /harbor_ui
COPY make/dev/nodeclarity/entrypoint.sh / COPY make/dev/nodeclarity/entrypoint.sh /
COPY src/ui_ng/tsconfig-aot.json /clarity-seed COPY src/ui_ng/tsconfig-aot.json /harbor_ui
COPY src/ui_ng/rollup-config.js /clarity-seed COPY src/ui_ng/rollup-config.js /harbor_ui
WORKDIR /clarity-seed WORKDIR /harbor_ui
RUN npm __proxy__ install -g @angular/cli && \ RUN npm __proxy__ install -g @angular/cli && \
npm __proxy__ install && \ npm __proxy__ install && \
chmod u+x /entrypoint.sh chmod u+x /entrypoint.sh
VOLUME ["/clarity-seed", "/clarity-seed/dist"] VOLUME ["/harbor_ui", "/harbor_ui/dist"]

4
make/dev/nodeclarity/angular-cli.json
View File

@ -1,7 +1,7 @@
{ {
"project": { "project": {
"version": "1.0.0-beta.20-4", "version": "1.1.0",
"name": "clarity-seed" "name": "Harbor"
}, },
"apps": [ "apps": [
{ {

2
make/dev/nodeclarity/entrypoint.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
cd /clarity-seed cd /harbor_ui
rm -rf dist/* rm -rf dist/*
npm_proxy= npm_proxy=