diff --git a/Dockerfile b/Dockerfile index baebb9d30fcc5bf430dbb7b3d77c0195ca83ff65..3e4db02011d0edca032e20112afc29fa240119cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,30 +3,24 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_TAG=8.2 -############################################################### -FROM opensource/istio-1.5/galley-1.5/galley:1.5.4 AS base + +FROM istio/galley:1.5.4 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} +LABEL org.opencontainers.image.title="galley" \ + org.opencontainers.image.description="Istio Galley provides configuration management services for Istio." \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.url="https://istio.io" \ + org.opencontainers.image.version="1.5.4" \ + maintainer="cht@dsop.io" + COPY --from=base /usr/local/bin/ /usr/local/bin/ RUN dnf update -y && \ dnf clean all && \ rm -rf /var/cache/dnf/ -############################################################### -# Provide label information -LABEL name="istio-galley" \ - maintainer="gavin.scallon@parsons.com" \ - vendor="Open Source" \ - version="1.5.4" \ - release="1" \ - summary="istio-galley" \ - description="Galley provides configuration management services for Istio" -############################################################### -# Run as non-root user USER 1001 -############################################################### -HEALTHCHECK --interval=1m --start-period=30s CMD version -############################################################### + ENTRYPOINT [ "/usr/local/bin/galley" ] diff --git a/README.md b/README.md index ceb8946e51ea7c9e516cf3867dfdf17744a9b562..4f16c8ff5c6c13ec8d60dd16597b65d0a3eddde1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # galley -Version 1.5.4 - # To Build/Run ```bash # Navigate to the download location of the galley tar file obtained from the diff --git a/download.yaml b/download.yaml index 0268316edd6d6d02b0f39be13032c45f49f50a42..5b5aeee08323f9c9e05e0da81fbc5e6b6ddcd7a4 100644 --- a/download.yaml +++ b/download.yaml @@ -1,4 +1,4 @@ --- resources: - url: "docker://docker.io/istio/galley@sha256:af917d433ce674fe072f891c0ee581ff1c0165b9827bab4ef2951d9d43dda542" - tag: opensource/istio-1.5/galley-1.5/galley:1.5.4 + tag: "istio/galley:1.5.4" diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000000000000000000000000000000000..50cb2dc95d323a763194d1c7d8ac6f250ea15594 --- /dev/null +++ b/renovate.json @@ -0,0 +1,33 @@ +{ + "assignees": ["@gavin.scallon"], + "baseBranches": ["development"], + "packageRules": [ + { + "datasources": ["docker"], + "packageNames": ["istio/galley"], + "separateMinorPatch": true, + "minor": { + "enabled": false + } + } + ], + "regexManagers": [ + { + "fileMatch": ["^Dockerfile$"], + "matchStrings": [ + "version=\"(?.*?)\"" + ], + "depNameTemplate": "istio/galley", + "datasourceTemplate": "docker" + }, + { + "fileMatch": ["^Jenkinsfile$"], + "matchStrings": [ + "version:\\s+\"(?.*?)\"" + ], + "depNameTemplate": "istio/galley", + "datasourceTemplate": "docker" + } + ] + } + \ No newline at end of file