Commit 09080f42 authored by Gary van Woerkens's avatar Gary van Woerkens
Browse files

Merge branch 'master' of github.com:SocialGouv/docker

parents 557d01b7 7c6532dd
include:
- project: SocialGouv/gitlab-ci-yml
file: /base_semantic_release_stage.yml
ref: v17.19.0
ref: v17.23.0
- project: SocialGouv/gitlab-ci-yml
file: /base_register_stage.yml
ref: v17.19.0
ref: v17.23.0
#
- /azure-cli/.gitlab-ci.yml
- /azure-db/.gitlab-ci.yml
......
## [4.7.1](https://github.com/SocialGouv/docker/compare/v4.7.0...v4.7.1) (2021-03-01)
### Bug Fixes
* **deps:** update all dependencies docker tags ([#550](https://github.com/SocialGouv/docker/issues/550)) ([e92110c](https://github.com/SocialGouv/docker/commit/e92110c633bbfdccaac011f037eeaabe5b59a0dc))
# [4.7.0](https://github.com/SocialGouv/docker/compare/v4.6.3...v4.7.0) (2021-03-01)
### Features
* **deps:** update curlimages/curl docker tag to v7.75.0 ([#552](https://github.com/SocialGouv/docker/issues/552)) ([4382417](https://github.com/SocialGouv/docker/commit/4382417e8f0832e56b85803f555af2b9eb8c68dd))
## [4.6.3](https://github.com/SocialGouv/docker/compare/v4.6.2...v4.6.3) (2021-02-26)
### Bug Fixes
* **deps:** update dependency socialgouv/k8s to v1.3.1 ([#549](https://github.com/SocialGouv/docker/issues/549)) ([826198f](https://github.com/SocialGouv/docker/commit/826198f104b1d5d3945422bdfa7e708841bb304f))
## [4.6.2](https://github.com/SocialGouv/docker/compare/v4.6.1...v4.6.2) (2021-02-25)
### Bug Fixes
* **deps:** update dependency socialgouv/k8s to v1.2.3 ([#546](https://github.com/SocialGouv/docker/issues/546)) ([151a3a1](https://github.com/SocialGouv/docker/commit/151a3a115723de8d5a8ccad0890668bcd5d9f616))
## [4.6.1](https://github.com/SocialGouv/docker/compare/v4.6.0...v4.6.1) (2021-02-23)
......
......@@ -32,24 +32,24 @@ $ docker pull docker.pkg.github.com/socialgouv/docker/<image>:<version>
| Project | Image | Links |
| ----------------------- | ------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------- |
| **azure-db** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/azure-db:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./azure-db/README.md) |
| **curl** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/curl:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./curl/README.md) |
| **fluentd-modsecurity** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/fluentd-modsecurity:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./fluent-modsecurity/README.md) |
| **git-deploy** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/git-deploy:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./git-deploy/README.md) |
| **helm** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/helm:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./helm/README.md) |
| **infra-ansible-ci** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/infra-ansible-ci:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./infra-ansible-ci/README.md) |
| **k8s-ns-killer** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/k8s-ns-killer:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./k8s-ns-killer/README.md) |
| **k8s-object-cleaner** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/k8s-object-cleaner:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./k8s-object-cleaner/README.md) |
| **kosko** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/kosko:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./kosko/README.md) |
| **kubectl** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/kubectl:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./kubectl/README.md) |
| **nginx4spa** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/nginx4spa:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./nginx4spa/README.md) |
| **pg-cleaner** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/pg-cleaner:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./pg-cleaner/README.md) |
| **puppeteer** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/puppeteer:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./puppeteer/README.md) |
| **puppeteer-mongo-pg** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/puppeteer-mongo-pg:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./puppeteer-mongo-pg/README.md) |
| **trivy** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/trivy:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./trivy/README.md) |
| **wait-for-postgres** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/wait-for-postgres:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./wait-for-postgres/README.md) |
| **wait-for-http** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/wait-for-http:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./wait-for-http/README.md) |
| **no-k8s** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/no-k8s:4.6.1` | [![README](https://img.shields.io/badge/README--green.svg)](./no-k8s/README.md) |
| **azure-db** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/azure-db:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./azure-db/README.md) |
| **curl** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/curl:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./curl/README.md) |
| **fluentd-modsecurity** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/fluentd-modsecurity:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./fluent-modsecurity/README.md) |
| **git-deploy** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/git-deploy:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./git-deploy/README.md) |
| **helm** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/helm:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./helm/README.md) |
| **infra-ansible-ci** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/infra-ansible-ci:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./infra-ansible-ci/README.md) |
| **k8s-ns-killer** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/k8s-ns-killer:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./k8s-ns-killer/README.md) |
| **k8s-object-cleaner** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/k8s-object-cleaner:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./k8s-object-cleaner/README.md) |
| **kosko** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/kosko:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./kosko/README.md) |
| **kubectl** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/kubectl:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./kubectl/README.md) |
| **nginx4spa** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/nginx4spa:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./nginx4spa/README.md) |
| **pg-cleaner** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/pg-cleaner:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./pg-cleaner/README.md) |
| **puppeteer** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/puppeteer:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./puppeteer/README.md) |
| **puppeteer-mongo-pg** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/puppeteer-mongo-pg:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./puppeteer-mongo-pg/README.md) |
| **trivy** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/trivy:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./trivy/README.md) |
| **wait-for-postgres** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/wait-for-postgres:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./wait-for-postgres/README.md) |
| **wait-for-http** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/wait-for-http:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./wait-for-http/README.md) |
| **no-k8s** | `docker pull registry.gitlab.factory.social.gouv.fr/socialgouv/docker/no-k8s:4.7.1` | [![README](https://img.shields.io/badge/README--green.svg)](./no-k8s/README.md) |
<br>
<br>
......
FROM python:3.9
# renovate: datasource=docker depName=hashicorp/terraform versioning=0.14.6
ARG TERRAFORM_VERSION=0.14.6
# renovate: datasource=docker depName=hashicorp/terraform versioning=0.14.7
ARG TERRAFORM_VERSION=0.14.7
# install dependencies (gettext-base to install envsubst)
RUN set -ex \
......
FROM registry.gitlab.factory.social.gouv.fr/socialgouv/docker/kosko:4.4.0
FROM registry.gitlab.factory.social.gouv.fr/socialgouv/docker/kosko:4.4.1
RUN apk add --update --no-cache git=~2
# renovate: datasource=github-tags depName=socialgouv/k8s
ARG K8S_VERSION=v1.2.2
ARG K8S_VERSION=v1.3.1
RUN git clone --depth 1 --branch ${K8S_VERSION} https://github.com/SocialGouv/k8s /k8s
WORKDIR /k8s/.k8s
......
FROM alpine:3.13.1
FROM alpine:3.13.2
# Installs latest Chromium (86) package.
RUN apk add --no-cache \
......
FROM curlimages/curl:7.74.0
FROM curlimages/curl:7.75.0
COPY ./bin /bin
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment