Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-26 12:15:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3481 from yixingjia/ossnotaryupdate

Browse Source 
Update Notary base images and oss package
This commit is contained in:
yixingjia 2017-10-31 19:46:07 -07:00 committed by GitHub
commit 8908b75085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -84,8 +84,8 @@ NOTARYFLAG=false
REGISTRYVERSION=2.6.2-photon
NGINXVERSION=1.11.13
PHOTONVERSION=1.0
NOTARYVERSION=server-0.5.0
NOTARYSIGNERVERSION=signer-0.5.0
NOTARYVERSION=server-0.5.1
NOTARYSIGNERVERSION=signer-0.5.1
MARIADBVERSION=10.2.8
HTTPPROXY=
REBUILDCLARITYFLAG=false

4
make/docker-compose.notary.yml
View File

@ -7,7 +7,7 @@ services:
networks:
- harbor-notary
notary-server:
image: vmware/notary-photon:server-0.5.0
image: vmware/notary-photon:server-0.5.1
container_name: notary-server
restart: always
networks:
@ -27,7 +27,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514"
tag: "notary-server"
notary-signer:
image: vmware/notary-photon:signer-0.5.0
image: vmware/notary-photon:signer-0.5.1
container_name: notary-signer
restart: always
networks:

7
make/photon/notary/server.Dockerfile
View File

@ -1,8 +1,11 @@
from library/photon:1.0
FROM vmware/photon:1.0
RUN tdnf distro-sync -y \
&& tdnf erase vim -y \
&& tdnf clean all
COPY ./binary/notary-server /bin/notary-server
COPY ./migrate /bin/migrate
COPY ./migrations/ /migrations/
ENV SERVICE_NAME=notary_server
ENTRYPOINT [ "notary-server" ]
ENTRYPOINT [ "notary-server" ]

7
make/photon/notary/signer.Dockerfile
View File

@ -1,8 +1,11 @@
from library/photon:1.0
FROM vmware/photon:1.0
RUN tdnf distro-sync -y \
&& tdnf erase vim -y \
&& tdnf clean all
COPY ./binary/notary-signer /bin/notary-signer
COPY ./migrate /bin/migrate
COPY ./migrations/ /migrations/
ENV SERVICE_NAME=notary_signer
ENTRYPOINT [ "notary-signer" ]
ENTRYPOINT [ "notary-signer" ]