From beefb40d0d28eaadc88ae3051acfe50e73e00895 Mon Sep 17 00:00:00 2001 From: yixingj Date: Mon, 30 Oct 2017 13:12:47 +0800 Subject: [PATCH 1/2] Update Notary base images and oss package 1> Update Notary server image to vmware/photon 2> Update NOtary signer image to vmware/photon 3> update oss package to latest --- make/photon/notary/server.Dockerfile | 7 +++++-- make/photon/notary/signer.Dockerfile | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/make/photon/notary/server.Dockerfile b/make/photon/notary/server.Dockerfile index d0e682a47..740a3e26f 100644 --- a/make/photon/notary/server.Dockerfile +++ b/make/photon/notary/server.Dockerfile @@ -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" ] \ No newline at end of file +ENTRYPOINT [ "notary-server" ] diff --git a/make/photon/notary/signer.Dockerfile b/make/photon/notary/signer.Dockerfile index 3ef8231cd..e9c67bc13 100644 --- a/make/photon/notary/signer.Dockerfile +++ b/make/photon/notary/signer.Dockerfile @@ -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" ] \ No newline at end of file +ENTRYPOINT [ "notary-signer" ] From 2953ca996783c8875190d9f422f944c2b8a9e95f Mon Sep 17 00:00:00 2001 From: yixingj Date: Mon, 30 Oct 2017 14:46:33 +0800 Subject: [PATCH 2/2] Update Notary base images and oss package 1> Update Notary server image to vmware/photon 2> Update NOtary signer image to vmware/photon 3> update oss package to latest --- Makefile | 4 ++-- make/docker-compose.notary.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3bf2d2187..6e7d7d66c 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/make/docker-compose.notary.yml b/make/docker-compose.notary.yml index 42d6a94a0..feab28a03 100644 --- a/make/docker-compose.notary.yml +++ b/make/docker-compose.notary.yml @@ -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: