disable root expiration date (#13670)

Signed-off-by: Wang Yan <wangyan@vmware.com>
This commit is contained in:
Wang Yan 2020-12-04 14:47:15 +08:00 committed by GitHub
parent f946e159ef
commit ef3a8760bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 25 additions and 1 deletions

View File

@ -1 +1 @@
v1.7.7 v1.7.8

View File

@ -8,6 +8,8 @@ COPY ./make/photon/adminserver/harbor_adminserver ./make/photon/adminserver/star
#As UI will be blocked until adminserver is ready, let adminserver do the initialise work for DB #As UI will be blocked until adminserver is ready, let adminserver do the initialise work for DB
COPY ./make/migrations /harbor/migrations COPY ./make/migrations /harbor/migrations
RUN chage -M 99999 root
HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/ping || exit 1 HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/ping || exit 1
RUN chmod u+x /harbor/harbor_adminserver /harbor/start.sh RUN chmod u+x /harbor/harbor_adminserver /harbor/start.sh

View File

@ -17,6 +17,8 @@ RUN chown -R 10000:10000 /chartserver \
&& chmod u+x /chartserver/chartm \ && chmod u+x /chartserver/chartm \
&& chmod u+x /docker-entrypoint.sh && chmod u+x /docker-entrypoint.sh
RUN chage -M 99999 root
HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -sS 127.0.0.1:9999/health || exit 1 HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -sS 127.0.0.1:9999/health || exit 1
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

View File

@ -20,6 +20,8 @@ RUN chown -R 10000:10000 /clair \
&& chmod u+x /docker-entrypoint.sh \ && chmod u+x /docker-entrypoint.sh \
&& chmod +x /dumb-init && chmod +x /dumb-init
RUN chage -M 99999 root
HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -sS 127.0.0.1:6061/health || exit 1 HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -sS 127.0.0.1:6061/health || exit 1
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

View File

@ -5,6 +5,8 @@ RUN tdnf install sudo -y >> /dev/null\
&& groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \
&& mkdir /harbor/ && mkdir /harbor/
RUN chage -M 99999 root
HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/ping || exit 1 HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/ping || exit 1
COPY ./make/photon/core/harbor_core ./make/photon/core/start.sh ./UIVERSION /harbor/ COPY ./make/photon/core/harbor_core ./make/photon/core/start.sh ./UIVERSION /harbor/
COPY ./src/core/views /harbor/views COPY ./src/core/views /harbor/views

View File

@ -16,6 +16,8 @@ RUN tdnf install -y shadow gzip postgresql >> /dev/null\
RUN tdnf erase -y toybox && tdnf install -y util-linux RUN tdnf erase -y toybox && tdnf install -y util-linux
RUN chage -M 99999 root
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data
ADD ./make/photon/db/docker-entrypoint.sh /entrypoint.sh ADD ./make/photon/db/docker-entrypoint.sh /entrypoint.sh

View File

@ -8,5 +8,7 @@ RUN mkdir /harbor/ \
COPY ./make/photon/jobservice/start.sh ./make/photon/jobservice/harbor_jobservice /harbor/ COPY ./make/photon/jobservice/start.sh ./make/photon/jobservice/harbor_jobservice /harbor/
RUN chmod u+x /harbor/harbor_jobservice /harbor/start.sh RUN chmod u+x /harbor/harbor_jobservice /harbor/start.sh
RUN chage -M 99999 root
WORKDIR /harbor/ WORKDIR /harbor/
ENTRYPOINT ["/harbor/start.sh"] ENTRYPOINT ["/harbor/start.sh"]

View File

@ -9,6 +9,8 @@ EXPOSE 80
VOLUME /var/cache/nginx /var/log/nginx /run VOLUME /var/cache/nginx /var/log/nginx /run
STOPSIGNAL SIGQUIT STOPSIGNAL SIGQUIT
RUN chage -M 99999 root
HEALTHCHECK CMD curl --fail -s http://127.0.0.1 || exit 1 HEALTHCHECK CMD curl --fail -s http://127.0.0.1 || exit 1
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]

View File

@ -11,5 +11,6 @@ COPY ./make/photon/notary/binary/migrate /bin/migrate
COPY ./make/photon/notary/binary/migrations/ /migrations/ COPY ./make/photon/notary/binary/migrations/ /migrations/
COPY ./make/photon/notary/server-start.sh /bin/server-start.sh COPY ./make/photon/notary/server-start.sh /bin/server-start.sh
RUN chmod +x /bin/notary-server /migrations/migrate.sh /bin/migrate /bin/migrate-patch /bin/server-start.sh RUN chmod +x /bin/notary-server /migrations/migrate.sh /bin/migrate /bin/migrate-patch /bin/server-start.sh
RUN chage -M 99999 root
ENV SERVICE_NAME=notary_server ENV SERVICE_NAME=notary_server
ENTRYPOINT [ "/bin/server-start.sh" ] ENTRYPOINT [ "/bin/server-start.sh" ]

View File

@ -11,5 +11,6 @@ COPY ./make/photon/notary/binary/migrations/ /migrations/
COPY ./make/photon/notary/signer-start.sh /bin/signer-start.sh COPY ./make/photon/notary/signer-start.sh /bin/signer-start.sh
RUN chmod +x /bin/notary-signer /migrations/migrate.sh /bin/migrate /bin/migrate-patch /bin/signer-start.sh RUN chmod +x /bin/notary-signer /migrations/migrate.sh /bin/migrate /bin/migrate-patch /bin/signer-start.sh
RUN chage -M 99999 root
ENV SERVICE_NAME=notary_signer ENV SERVICE_NAME=notary_signer
ENTRYPOINT [ "/bin/signer-start.sh" ] ENTRYPOINT [ "/bin/signer-start.sh" ]

View File

@ -29,6 +29,8 @@ COPY make/photon/portal/nginx.conf /etc/nginx/nginx.conf
STOPSIGNAL SIGQUIT STOPSIGNAL SIGQUIT
RUN chage -M 99999 root
HEALTHCHECK CMD curl --fail -s http://127.0.0.1 || exit 1 HEALTHCHECK CMD curl --fail -s http://127.0.0.1 || exit 1
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]

View File

@ -8,6 +8,8 @@ COPY ./make/photon/redis/docker-entrypoint.sh /usr/bin/
COPY ./make/photon/redis/redis.conf /etc/redis.conf COPY ./make/photon/redis/redis.conf /etc/redis.conf
RUN chmod +x /usr/bin/docker-entrypoint.sh \ RUN chmod +x /usr/bin/docker-entrypoint.sh \
&& chown redis:redis /etc/redis.conf && chown redis:redis /etc/redis.conf
RUN chage -M 99999 root
ENTRYPOINT ["docker-entrypoint.sh"] ENTRYPOINT ["docker-entrypoint.sh"]
EXPOSE 6379 EXPOSE 6379

View File

@ -18,6 +18,8 @@ RUN mkdir -p /etc/registry
COPY ./make/photon/registry/binary/registry /usr/bin COPY ./make/photon/registry/binary/registry /usr/bin
RUN chmod u+x /usr/bin/registry RUN chmod u+x /usr/bin/registry
RUN chage -M 99999 root
HEALTHCHECK CMD curl 127.0.0.1:5000/ HEALTHCHECK CMD curl 127.0.0.1:5000/
VOLUME ["/var/lib/registry"] VOLUME ["/var/lib/registry"]

View File

@ -15,6 +15,8 @@ RUN chmod u+x /harbor/harbor_registryctl \
&& chmod u+x /usr/bin/registry \ && chmod u+x /usr/bin/registry \
&& chmod u+x /harbor/start.sh && chmod u+x /harbor/start.sh
RUN chage -M 99999 root
HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/health || exit 1 HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/health || exit 1
VOLUME ["/var/lib/registry"] VOLUME ["/var/lib/registry"]