From e64c80ba7b48a0739a8fca8f41c287653970c72b Mon Sep 17 00:00:00 2001 From: Bin Liang Date: Thu, 18 Jun 2020 17:32:21 +0800 Subject: [PATCH] change to Photon 3.0 --- make/photon/chartserver/Dockerfile | 2 +- make/photon/clair/Dockerfile | 2 +- make/photon/core/Dockerfile | 2 +- make/photon/db/Dockerfile | 2 +- make/photon/jobservice/Dockerfile | 2 +- make/photon/log/Dockerfile | 2 +- make/photon/nginx/Dockerfile | 2 +- make/photon/notary/server.Dockerfile | 4 ++-- make/photon/notary/signer.Dockerfile | 4 ++-- make/photon/portal/Dockerfile | 2 +- make/photon/prepare/Dockerfile | 2 +- make/photon/redis/Dockerfile | 2 +- make/photon/registry/Dockerfile | 2 +- make/photon/registryctl/Dockerfile | 2 +- tools/migration/Dockerfile | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/make/photon/chartserver/Dockerfile b/make/photon/chartserver/Dockerfile index 3ff8922216..f31c1578de 100644 --- a/make/photon/chartserver/Dockerfile +++ b/make/photon/chartserver/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 RUN tdnf install -y shadow sudo >>/dev/null\ && tdnf clean all \ diff --git a/make/photon/clair/Dockerfile b/make/photon/clair/Dockerfile index 8ec5c732e2..1b1e0ce451 100644 --- a/make/photon/clair/Dockerfile +++ b/make/photon/clair/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 RUN tdnf install -y git shadow sudo rpm xz python-xml >>/dev/null\ && tdnf clean all \ diff --git a/make/photon/core/Dockerfile b/make/photon/core/Dockerfile index d585a98ee8..45884ee997 100644 --- a/make/photon/core/Dockerfile +++ b/make/photon/core/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 RUN tdnf install sudo tzdata -y >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/db/Dockerfile b/make/photon/db/Dockerfile index e9d765393b..b856f09699 100644 --- a/make/photon/db/Dockerfile +++ b/make/photon/db/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 ENV PGDATA /var/lib/postgresql/data diff --git a/make/photon/jobservice/Dockerfile b/make/photon/jobservice/Dockerfile index 1ee9277dda..0789a417e0 100644 --- a/make/photon/jobservice/Dockerfile +++ b/make/photon/jobservice/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 RUN tdnf install sudo tzdata -y >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/log/Dockerfile b/make/photon/log/Dockerfile index 6eb00bed14..de7ef0da26 100644 --- a/make/photon/log/Dockerfile +++ b/make/photon/log/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 RUN tdnf install -y cronie rsyslog logrotate shadow tar gzip sudo >> /dev/null\ && mkdir /var/spool/rsyslog \ diff --git a/make/photon/nginx/Dockerfile b/make/photon/nginx/Dockerfile index 902107205d..ab7aadac81 100644 --- a/make/photon/nginx/Dockerfile +++ b/make/photon/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 RUN tdnf install sudo nginx -y >> /dev/null\ && tdnf clean all \ diff --git a/make/photon/notary/server.Dockerfile b/make/photon/notary/server.Dockerfile index 4b0172439f..d2431cc0f8 100644 --- a/make/photon/notary/server.Dockerfile +++ b/make/photon/notary/server.Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 RUN tdnf install -y shadow sudo \ && tdnf clean all \ @@ -12,4 +12,4 @@ COPY ./make/photon/notary/binary/migrations/ /migrations/ RUN chmod +x /bin/notary-server /migrations/migrate.sh /bin/migrate /bin/migrate-patch ENV SERVICE_NAME=notary_server USER notary -CMD migrate-patch -database=${DB_URL} && /migrations/migrate.sh && /bin/notary-server -config=/etc/notary/server-config.postgres.json -logf=logfmt \ No newline at end of file +CMD migrate-patch -database=${DB_URL} && /migrations/migrate.sh && /bin/notary-server -config=/etc/notary/server-config.postgres.json -logf=logfmt diff --git a/make/photon/notary/signer.Dockerfile b/make/photon/notary/signer.Dockerfile index 95e98bfd83..b9fbd5e2a6 100644 --- a/make/photon/notary/signer.Dockerfile +++ b/make/photon/notary/signer.Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 RUN tdnf install -y shadow sudo \ && tdnf clean all \ @@ -12,4 +12,4 @@ COPY ./make/photon/notary/binary/migrations/ /migrations/ RUN chmod +x /bin/notary-signer /migrations/migrate.sh /bin/migrate /bin/migrate-patch ENV SERVICE_NAME=notary_signer USER notary -CMD migrate-patch -database=${DB_URL} && /migrations/migrate.sh && /bin/notary-signer -config=/etc/notary/signer-config.postgres.json -logf=logfmt \ No newline at end of file +CMD migrate-patch -database=${DB_URL} && /migrations/migrate.sh && /bin/notary-signer -config=/etc/notary/signer-config.postgres.json -logf=logfmt diff --git a/make/photon/portal/Dockerfile b/make/photon/portal/Dockerfile index a599a15802..fd3a210ebe 100644 --- a/make/photon/portal/Dockerfile +++ b/make/photon/portal/Dockerfile @@ -23,7 +23,7 @@ RUN ls -la \ && npm run release -FROM photon:2.0 +FROM photon:3.0 COPY --from=nodeportal /build_dir/dist /usr/share/nginx/html COPY --from=nodeportal /build_dir/swagger.yaml /usr/share/nginx/html diff --git a/make/photon/prepare/Dockerfile b/make/photon/prepare/Dockerfile index 58e8430c4e..e9444f88fe 100644 --- a/make/photon/prepare/Dockerfile +++ b/make/photon/prepare/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 ENV LANG en_US.UTF-8 diff --git a/make/photon/redis/Dockerfile b/make/photon/redis/Dockerfile index a90873b4b5..52e3637ade 100644 --- a/make/photon/redis/Dockerfile +++ b/make/photon/redis/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 RUN tdnf install -y redis sudo diff --git a/make/photon/registry/Dockerfile b/make/photon/registry/Dockerfile index b21cfe4bc2..5c5de39b7f 100644 --- a/make/photon/registry/Dockerfile +++ b/make/photon/registry/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 MAINTAINER wangyan@vmware.com diff --git a/make/photon/registryctl/Dockerfile b/make/photon/registryctl/Dockerfile index f1cef2afb8..ce6a6bc1d3 100644 --- a/make/photon/registryctl/Dockerfile +++ b/make/photon/registryctl/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 MAINTAINER wangyan@vmware.com diff --git a/tools/migration/Dockerfile b/tools/migration/Dockerfile index 425f46de66..3a29174d68 100644 --- a/tools/migration/Dockerfile +++ b/tools/migration/Dockerfile @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:3.0 ENV PGDATA /var/lib/postgresql/data