diff --git a/VERSION b/VERSION index f0b77c197..257d138aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v1.7.7 +v1.7.8 diff --git a/make/photon/adminserver/Dockerfile b/make/photon/adminserver/Dockerfile index f0ec24883..4341aa517 100644 --- a/make/photon/adminserver/Dockerfile +++ b/make/photon/adminserver/Dockerfile @@ -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 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 RUN chmod u+x /harbor/harbor_adminserver /harbor/start.sh diff --git a/make/photon/chartserver/Dockerfile b/make/photon/chartserver/Dockerfile index 3ff892221..6af10a77c 100644 --- a/make/photon/chartserver/Dockerfile +++ b/make/photon/chartserver/Dockerfile @@ -17,6 +17,8 @@ RUN chown -R 10000:10000 /chartserver \ && chmod u+x /chartserver/chartm \ && 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 ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/make/photon/clair/Dockerfile b/make/photon/clair/Dockerfile index 8ec5c732e..92bc9e20b 100644 --- a/make/photon/clair/Dockerfile +++ b/make/photon/clair/Dockerfile @@ -20,6 +20,8 @@ RUN chown -R 10000:10000 /clair \ && chmod u+x /docker-entrypoint.sh \ && 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 ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/make/photon/core/Dockerfile b/make/photon/core/Dockerfile index ecf09e136..a9b2165fd 100644 --- a/make/photon/core/Dockerfile +++ b/make/photon/core/Dockerfile @@ -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 \ && mkdir /harbor/ +RUN chage -M 99999 root + 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 ./src/core/views /harbor/views diff --git a/make/photon/db/Dockerfile b/make/photon/db/Dockerfile index 2df280a09..667511e33 100644 --- a/make/photon/db/Dockerfile +++ b/make/photon/db/Dockerfile @@ -16,6 +16,8 @@ RUN tdnf install -y shadow gzip postgresql >> /dev/null\ RUN tdnf erase -y toybox && tdnf install -y util-linux +RUN chage -M 99999 root + VOLUME /var/lib/postgresql/data ADD ./make/photon/db/docker-entrypoint.sh /entrypoint.sh diff --git a/make/photon/jobservice/Dockerfile b/make/photon/jobservice/Dockerfile index 3131550d2..53572039e 100644 --- a/make/photon/jobservice/Dockerfile +++ b/make/photon/jobservice/Dockerfile @@ -8,5 +8,7 @@ RUN mkdir /harbor/ \ COPY ./make/photon/jobservice/start.sh ./make/photon/jobservice/harbor_jobservice /harbor/ RUN chmod u+x /harbor/harbor_jobservice /harbor/start.sh + +RUN chage -M 99999 root WORKDIR /harbor/ ENTRYPOINT ["/harbor/start.sh"] diff --git a/make/photon/nginx/Dockerfile b/make/photon/nginx/Dockerfile index 3d244ee58..03b0ff50d 100644 --- a/make/photon/nginx/Dockerfile +++ b/make/photon/nginx/Dockerfile @@ -9,6 +9,8 @@ EXPOSE 80 VOLUME /var/cache/nginx /var/log/nginx /run STOPSIGNAL SIGQUIT +RUN chage -M 99999 root + HEALTHCHECK CMD curl --fail -s http://127.0.0.1 || exit 1 CMD ["nginx", "-g", "daemon off;"] diff --git a/make/photon/notary/server.Dockerfile b/make/photon/notary/server.Dockerfile index 5d60d17f4..3834fabc3 100644 --- a/make/photon/notary/server.Dockerfile +++ b/make/photon/notary/server.Dockerfile @@ -11,5 +11,6 @@ COPY ./make/photon/notary/binary/migrate /bin/migrate COPY ./make/photon/notary/binary/migrations/ /migrations/ 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 chage -M 99999 root ENV SERVICE_NAME=notary_server ENTRYPOINT [ "/bin/server-start.sh" ] diff --git a/make/photon/notary/signer.Dockerfile b/make/photon/notary/signer.Dockerfile index b27bd3cd5..8db9ec498 100644 --- a/make/photon/notary/signer.Dockerfile +++ b/make/photon/notary/signer.Dockerfile @@ -11,5 +11,6 @@ COPY ./make/photon/notary/binary/migrations/ /migrations/ 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 chage -M 99999 root ENV SERVICE_NAME=notary_signer ENTRYPOINT [ "/bin/signer-start.sh" ] diff --git a/make/photon/portal/Dockerfile b/make/photon/portal/Dockerfile index c011dc0de..132bf3014 100644 --- a/make/photon/portal/Dockerfile +++ b/make/photon/portal/Dockerfile @@ -29,6 +29,8 @@ COPY make/photon/portal/nginx.conf /etc/nginx/nginx.conf STOPSIGNAL SIGQUIT +RUN chage -M 99999 root + HEALTHCHECK CMD curl --fail -s http://127.0.0.1 || exit 1 CMD ["nginx", "-g", "daemon off;"] diff --git a/make/photon/redis/Dockerfile b/make/photon/redis/Dockerfile index efac15505..f33620411 100644 --- a/make/photon/redis/Dockerfile +++ b/make/photon/redis/Dockerfile @@ -8,6 +8,8 @@ COPY ./make/photon/redis/docker-entrypoint.sh /usr/bin/ COPY ./make/photon/redis/redis.conf /etc/redis.conf RUN chmod +x /usr/bin/docker-entrypoint.sh \ && chown redis:redis /etc/redis.conf +RUN chage -M 99999 root + ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 6379 diff --git a/make/photon/registry/Dockerfile b/make/photon/registry/Dockerfile index c7b35eb88..bed1402c3 100644 --- a/make/photon/registry/Dockerfile +++ b/make/photon/registry/Dockerfile @@ -18,6 +18,8 @@ RUN mkdir -p /etc/registry COPY ./make/photon/registry/binary/registry /usr/bin RUN chmod u+x /usr/bin/registry +RUN chage -M 99999 root + HEALTHCHECK CMD curl 127.0.0.1:5000/ VOLUME ["/var/lib/registry"] diff --git a/make/photon/registryctl/Dockerfile b/make/photon/registryctl/Dockerfile index 16fc3fcf2..dc1b905a8 100644 --- a/make/photon/registryctl/Dockerfile +++ b/make/photon/registryctl/Dockerfile @@ -15,6 +15,8 @@ RUN chmod u+x /harbor/harbor_registryctl \ && chmod u+x /usr/bin/registry \ && 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 VOLUME ["/var/lib/registry"]