diff --git a/Dockerfile b/Dockerfile index d495f129569726ee87a8300c26a30a54eccfd4ea..ffdd9813e85d9fb39231b3c759d2569e24b09d1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,30 +1,22 @@ -############################################################### -# Default registry variables ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_TAG=8.2 -############################################################### -# Copy Pilot contents to base image -FROM opensource/istio-1.6/pilot-1.6/pilot:1.6.1 AS base + +FROM istio/pilot:1.6.1 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL name="istio-pilot" \ - maintainer="gavin.scallon@parsons.com" \ - vendor="Open Source" \ - version="1.6.1" \ - release="1" \ - summary="Istio Pilot provides traffic management capabilities in the Istio Service mesh" \ - description="provides service discovery for the Envoy sidecars, traffic management capabilities for intelligent routing, and resiliency." +LABEL org.opencontainers.image.title="pilot" \ + org.opencontainers.image.description="Istio Pilot provides traffic management capabilities in the Istio Service mesh." \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.url="https://istio.io" \ + org.opencontainers.image.version="1.6.1" \ + maintainer="cht@dsop.io" COPY --from=base /usr/local/bin/pilot-discovery /usr/local/bin/ COPY --from=base /cacert.pem /cacert.pem EXPOSE 80 443 USER 1001 -############################################################### -ENTRYPOINT [ "/usr/local/bin/pilot-discovery" ] - - - +ENTRYPOINT [ "/usr/local/bin/pilot-discovery" ] diff --git a/Jenkinsfile b/Jenkinsfile index c536db007cdd4fe920d2158a2fe1a3866b75d6ba..8916a8470a265a0baf5e5092bc6cafe105e5b048 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline( version: "1.6.1") \ No newline at end of file +dccscrPipeline(version: "1.6.1") diff --git a/README.md b/README.md index ea687d6d696289cf981ed873e795da83c62a9547..2e30e8c95465730a1d42b08857ae268d4f8b9867 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # pilot -Version 1.6.1 - # To Build/Run ```bash # Download the tar of the image from the Iron Bank and @@ -21,4 +19,4 @@ capabilities for intelligent routing (e.g., A/B tests, canary rollouts, etc.), and resiliency (timeouts, retries, circuit breakers, etc.). Deployment Note: The istio-pilot deployment had been removed in Istio 1.5 in favor of the -istiod deployment, which contains all functionality that the Pilot deployment once had. \ No newline at end of file +istiod deployment, which contains all functionality that the Pilot deployment once had. diff --git a/download.yaml b/download.yaml index a4be3ba3f1f24a5482453f091cd63f20a22c8652..4146de387d0e156f3fb92dd1ccb2bc8f979f2112 100644 --- a/download.yaml +++ b/download.yaml @@ -1,4 +1,4 @@ --- resources: - - url: "docker://docker.io/istio/pilot@sha256:b82b8bc19e697318983f11fc9488086c236537def391d0c72fc01e37531cbdaa" - tag: "opensource/istio-1.6/pilot-1.6/pilot:1.6.1" \ No newline at end of file + - url: "docker://docker.io/istio/pilot@sha256:dd0fe167963823d4d5eb1e7309ebda03c2227c749254e4d4e68ebeb88fbc28f5" + tag: "istio/pilot:1.6.1" diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000000000000000000000000000000000..9a9c2670c8a3be6c82f3c5e84a8d24ae2e5990f8 --- /dev/null +++ b/renovate.json @@ -0,0 +1,32 @@ +{ + "assignees": ["@gavin.scallon"], + "baseBranches": ["development"], + "packageRules": [ + { + "datasources": ["docker"], + "packageNames": ["istio/pilot"], + "separateMinorPatch": true, + "minor": { + "enabled": false + } + } + ], + "regexManagers": [ + { + "fileMatch": ["^Dockerfile$"], + "matchStrings": [ + "version=\"(?.*?)\"" + ], + "depNameTemplate": "istio/pilot", + "datasourceTemplate": "docker" + }, + { + "fileMatch": ["^Jenkinsfile$"], + "matchStrings": [ + "version:\\s+\"(?.*?)\"" + ], + "depNameTemplate": "istio/pilot", + "datasourceTemplate": "docker" + } + ] +}