From efbde452505aa63bf6802df6477ece387fa3ddca Mon Sep 17 00:00:00 2001
From: Xueshan Feng <xueshan-feng@stanford.edu>
Date: Fri, 6 Mar 2020 21:46:03 -0800
Subject: [PATCH] Tidy up code.

---
 Dockerfile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7ad9a65..93e3ca7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 FROM debian:buster-slim AS stage
-
 ADD build.sh /
 RUN /build.sh
 
@@ -8,7 +7,7 @@ LABEL maintainer="sfeng@stanford.edu"
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && \
-	apt-get install -y -qq  \
+	apt-get install -y -qq \
 	ca-certificates \
 	coreutils \
 	libsasl2-2 \
@@ -19,9 +18,9 @@ RUN apt-get update && \
 	lmdb-utils \
 	krb5-user \
 	kstart \
-	procps \
-	wget
+	procps
 
+# Copy software from stage image
 COPY --from=stage /artifacts /
 
 RUN mkdir -p /etc/ldap/sasl2 \
@@ -32,13 +31,8 @@ RUN mkdir -p /etc/ldap/sasl2 \
 	&& ln -s /var/lib/ldap/logs/ldap /var/log/ldap \
 	&& openssl req -x509 -newkey rsa:4096 -keyout /etc/ssl/private/server.key -out /etc/ssl/certs/server.pem -days 365 -nodes -subj "/CN=$HOSTNAME"
 
-# krb5 conf
-COPY etc/krb5.conf /etc/krb5.conf
-
-# ldap conf
-COPY etc/ldap/ldap.conf /etc/ldap/ldap.conf
-COPY etc/default/slapd  /etc/default/slapd
-COPY etc/saslauthd.conf /etc/saslauthd.conf
+# krb5 conf, sldapd conf, sasldauthd conf
+COPY etc /etc/
 
 # Link default configuration path to customized paths
 RUN ln -s /usr/lib/slapd /usr/sbin/slapd \
-- 
GitLab