From 7134346c78966882c9f85af6da19c27120c3b925 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Fri, 5 Jul 2019 12:38:30 +0300
Subject: [PATCH] Added Docker pre-commit hooks.
- hadolint and docker-compose config.
- Fix what hadolint complained about.
---
.pre-commit-config.yaml | 5 +++++
ldap-account-manager/Dockerfile | 8 ++++----
nss-pam-ldapd/Dockerfile | 8 ++++----
slapd/Dockerfile | 6 +++---
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a12c2fd..ad5587b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -25,3 +25,8 @@ repos:
hooks:
- id: shell-lint
- id: shellcheck
+ - repo: https://www.shore.co.il/git/docker-pre-commit
+ rev: v0.1.0
+ hooks:
+ - id: hadolint
+ - id: docker-compose
diff --git a/ldap-account-manager/Dockerfile b/ldap-account-manager/Dockerfile
index 3217dfd..0d55bb8 100644
--- a/ldap-account-manager/Dockerfile
+++ b/ldap-account-manager/Dockerfile
@@ -1,10 +1,10 @@
FROM debian:sid-slim
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- ca-certificates \
- ldap-account-manager\
- patch \
- wget \
+ ca-certificates=20190110 \
+ ldap-account-manager=6.7-1 \
+ patch=2.7.6-4 \
+ wget=1.20.1-1.1 \
&& \
chmod 755 /var/log/apache2 && \
ln -sf /dev/stdout /var/log/apache2/access.log && \
diff --git a/nss-pam-ldapd/Dockerfile b/nss-pam-ldapd/Dockerfile
index b9c274f..8bc9d87 100644
--- a/nss-pam-ldapd/Dockerfile
+++ b/nss-pam-ldapd/Dockerfile
@@ -1,10 +1,10 @@
FROM debian:stretch-slim
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- ca-certificates \
- gosu \
- libnss-ldapd \
- libpam-ldapd \
+ ca-certificates=20161130+nmu1+deb9u1 \
+ gosu=1.10-1+b2 \
+ libnss-ldapd=0.9.7-2+deb9u1 \
+ libpam-ldapd=0.9.7-2+deb9u1 \
&& \
mkdir -p /run/nslcd && \
chown -R nslcd:nslcd /run/nslcd/ && \
diff --git a/slapd/Dockerfile b/slapd/Dockerfile
index 2ed2b02..8b3b550 100644
--- a/slapd/Dockerfile
+++ b/slapd/Dockerfile
@@ -2,9 +2,9 @@ FROM debian:stretch-slim
RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- gnutls-bin \
- ldap-utils \
- slapd \
+ gnutls-bin=3.5.8-5+deb9u4 \
+ ldap-utils=2.4.44+dfsg-5+deb9u2 \
+ slapd=2.4.44+dfsg-5+deb9u2 \
&& \
mkdir -p /run/slapd && \
rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
--
GitLab