change to Photon 3.0

hzliangbin · Jun 18, 2020 · e64c80b · e64c80b
1 parent 17f772a
commit e64c80b
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+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
@@ -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
+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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-FROM photon:2.0
+FROM photon:3.0
 
 MAINTAINER [email protected]
 

diff --git a/make/photon/registryctl/Dockerfile b/make/photon/registryctl/Dockerfile
@@ -1,4 +1,4 @@
-FROM photon:2.0
+FROM photon:3.0
 
 MAINTAINER [email protected]
 

diff --git 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