Updating openssh to 7.8 (7.9 did not compile)

EGA-archive · Nov 13, 2018 · e0d0f0d · e0d0f0d
1 parent a5d7773
commit e0d0f0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/deploy/images/inbox/Dockerfile b/deploy/images/inbox/Dockerfile
@@ -7,7 +7,7 @@ RUN groupadd -r lega && \
 EXPOSE 9000
 VOLUME /ega/inbox
 
-RUN yum -y install autoconf patch openssl-devel pam-devel libcurl-devel nss-tools readline-devel
+RUN yum -y install autoconf patch openssl-devel pam-devel libcurl-devel nss-tools readline-devel libedit-devel
 #    	   	   nc nmap tcpdump lsof strace bash-completion bash-completion-extras
 
 ##
@@ -36,7 +36,7 @@ RUN ldconfig -v
 ARG OPENSSH_DIR=/opt/openssh
 ARG SSHD_UID=74
 ARG SSHD_GID=74
-ARG OPENSSH_TAG=V_7_7_P1
+ARG OPENSSH_TAG=V_7_8_P1
 
 RUN getent group ssh_keys >/dev/null || groupadd -r ssh_keys || :
 RUN getent group sshd || groupadd -g ${SSHD_GID} -r sshd
@@ -67,7 +67,7 @@ RUN git clone --branch ${OPENSSH_TAG} git://anongit.mindrot.org/openssh.git /roo
         --with-pam \
         --without-selinux \
 	--without-kerberos5 \
-        --without-libedit
+        --with-libedit
 
 COPY notify_cega.patch /root/openssh/notify_cega.patch
 

diff --git a/deploy/images/lega/Dockerfile b/deploy/images/lega/Dockerfile
@@ -10,13 +10,15 @@ LABEL maintainer "EGA System Developers"
 RUN groupadd -r lega && \
     useradd -M -r -g lega lega
 
-RUN git clone https://github.com/EGA-archive/LocalEGA.git /root/LocalEGA
-
 ARG checkout=master
+RUN git clone https://github.com/EGA-archive/LocalEGA.git /root/LocalEGA && \
+    cd /root/LocalEGA && \
+    git checkout ${checkout}
 
-RUN cd /root/LocalEGA && git checkout ${checkout}
+RUN git clone https://github.com/EGA-archive/crypt4gh.git /root/crypt4gh && \
+    pip3.6 install -r /root/crypt4gh/requirements.txt && \
+    rm -rf /root/crypt4gh
 
-# Requirements include crypt4gh (from https://github.com/EGA-archive/crypt4gh.git)
 RUN pip3.6 install -r /root/LocalEGA/requirements.txt && \
     pip3.6 install /root/LocalEGA && \
     rm -rf /root/LocalEGA