diff --git a/Dockerfile b/Dockerfile index f1563bea3c69f72c0fa861b598ea480d2e74170c..e5c8c24bfb1a7c2d4caf049fabe41c7d3462944a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,33 +3,26 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_TAG=8.2 -############################################################### -# Copy sidecar-injector contents to base image -FROM opensource/istio-1.5/sidecar_injector-1.5/sidecar_injector:1.5.4 AS base + +FROM istio/sidecar_injector:1.5.4 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} +LABEL org.opencontainers.image.title="sidecar_injector" \ + org.opencontainers.image.description="Istio sidecar_injector is a webhook for automatic Istio sidecar injection." \ + 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/sidecar-injector /usr/local/bin/ RUN dnf update -y && \ dnf clean all && \ rm -rf /var/cache/dnf/ -############################################################### -# Provide label information -LABEL name="istio-sidecar-injector" \ - maintainer="gavin.scallon@parsons.com" \ - vendor="Open Source" \ - version="1.5.4" \ - release="1" \ - summary="istio-sidecar-injector" \ - description="Kubernetes webhook for automatic Istio sidecar injection." -############################################################### -# Run as non-root user USER 1001 -############################################################### -HEALTHCHECK --interval=1m --start-period=30s CMD version -############################################################### + ENTRYPOINT [ "/usr/local/bin/sidecar-injector" ] diff --git a/README.md b/README.md index 175073614508ae24caa9a5f33882ed00f5ddf484..367731c5e47b4db88ba0e0236c12a11d6febdde4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # sidecar_injector -Version 1.5.4 - # To Run ``` # Navigate to the download location of the galley tar file obtained from the diff --git a/download.yaml b/download.yaml index 164bffc684596d0daceca2fb4bea926f5a8d8b63..708ee40519ef6c84f931b534ff9498c5f33c31f9 100644 --- a/download.yaml +++ b/download.yaml @@ -1,4 +1,4 @@ --- resources: - url: "docker://docker.io/istio/sidecar_injector@sha256:cf95e660f2dc193148f93066e7f9b72e92269667a500a7f3921b3d81e4809ce7" - tag: "opensource/istio-1.5/sidecar_injector-1.5/sidecar_injector:1.5.4" \ No newline at end of file + tag: "istio/sidecar_injector:1.5.4" \ No newline at end of file diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000000000000000000000000000000000..4de24fb11a5c90880fbe87c0e95ae7338999f41a --- /dev/null +++ b/renovate.json @@ -0,0 +1,33 @@ +{ + "assignees": ["@gavin.scallon"], + "baseBranches": ["development"], + "packageRules": [ + { + "datasources": ["docker"], + "packageNames": ["istio/sidecar_injector"], + "separateMinorPatch": true, + "minor": { + "enabled": false + } + } + ], + "regexManagers": [ + { + "fileMatch": ["^Dockerfile$"], + "matchStrings": [ + "version=\"(?.*?)\"" + ], + "depNameTemplate": "istio/sidecar_injector", + "datasourceTemplate": "docker" + }, + { + "fileMatch": ["^Jenkinsfile$"], + "matchStrings": [ + "version:\\s+\"(?.*?)\"" + ], + "depNameTemplate": "istio/sidecar_injector", + "datasourceTemplate": "docker" + } + ] + } + \ No newline at end of file