Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-03-12 14:39:06 +01:00
Code Issues Projects Releases Wiki Activity

Use dumb-init for Clair entrypoint (#3361)

Browse Source
This commit is contained in:
Ben Sebastian 2017-11-16 01:02:09 -05:00 committed by Daniel Jiang
parent ab7627e5c3
commit ef14b1f308
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/photon/clair/Dockerfile
View File

@ -1,5 +1,6 @@
FROM vmware/photon:1.0 FROM vmware/photon:1.0
RUN tdnf distro-sync -y \ RUN tdnf distro-sync -y \
&& tdnf erase vim -y \ && tdnf erase vim -y \
&& tdnf install -y git shadow sudo bzr rpm xz python-xml \ && tdnf install -y git shadow sudo bzr rpm xz python-xml \
@ -9,11 +10,20 @@ RUN tdnf distro-sync -y \
&& useradd --no-log-init -m -r -g 10000 -u 10000 clair && useradd --no-log-init -m -r -g 10000 -u 10000 clair
COPY clair /clair2.0.1/ COPY clair /clair2.0.1/
COPY docker-entrypoint.sh /docker-entrypoint.sh COPY docker-entrypoint.sh /docker-entrypoint.sh
COPY dumb-init /dumb-init \
VOLUME /config VOLUME /config
EXPOSE 6060 6061 EXPOSE 6060 6061
RUN chown -R 10000:10000 /clair2.0.1 \ RUN chown -R 10000:10000 /clair2.0.1 \
&& chmod u+x /clair2.0.1/clair \ && chmod u+x /clair2.0.1/clair \
&& chmod u+x /docker-entrypoint.sh && chmod u+x /docker-entrypoint.sh
&& chmod +x /dumb-init
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
USER clair USER clair
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

2
make/photon/clair/docker-entrypoint.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
set -e set -e
/clair2.0.1/clair -config /config/config.yaml /dumb-init -- /clair2.0.1/clair -config /config/config.yaml
set +e set +e

BIN
make/photon/clair/dumb-init Executable file
View File

Binary file not shown.