From 9c47b3864f8d910026c180ab8b8f3e84cfbc91ac Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Thu, 20 Oct 2016 23:48:08 +0800 Subject: [PATCH 1/2] bump version to 1.2.74 --- Dockerfile | 31 ++++++++++++++++++++++++------- requirements.txt | 5 +---- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index df37099..66559fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,22 @@ FROM python:2.7 RUN apt-get update && \ - apt-get install -y python-dev libldap2-dev libsasl2-dev libssl-dev python-ldap + apt-get install -y \ + libldap2-dev \ + libsasl2-dev \ + libssl-dev \ + python-dev \ + python-dns \ + python-excelerator \ + python-imaging \ + python-ipaddr \ + python-ldap \ + python-netaddr \ + python-m2crypto \ + python-paramiko \ + python-pip \ + python-pyasn1 \ + python-pyasn1-modules ENV PYTHONPATH "/usr/local/lib/python2.7/site-packages" @@ -11,18 +26,20 @@ RUN pip install --no-cache-dir -r requirements.txt RUN useradd web2ldap -RUN wget http://www.web2ldap.de/download/web2ldap-1.2.31.tar.gz && \ - tar -zxvf web2ldap-1.2.31.tar.gz && \ - mv web2ldap-1.2.31 /opt/web2ldap && \ - rm -f web2ldap-1.2.31.tar.gz +ENV WEB2LDAP_VERSION "1.2.74" + +RUN wget "http://www.web2ldap.de/download/web2ldap-$WEB2LDAP_VERSION.tar.gz" && \ + tar -zxvf "web2ldap-$WEB2LDAP_VERSION.tar.gz" && \ + mv "web2ldap-$WEB2LDAP_VERSION" /opt/web2ldap && \ + rm -f "web2ldap-$WEB2LDAP_VERSION.tar.gz" WORKDIR /opt/web2ldap RUN sed -i s/127.0.0.1:1760/0.0.0.0:1760/g etc/web2ldap/web2ldapcnf/standalone.py && \ - sed -i s/"\['127.0.0.0\/255.0.0.0','::1','fe00::0'\]"/"\['0.0.0.0\/0.0.0.0','::0'\]"/g etc/web2ldap/web2ldapcnf/standalone.py + sed -i s/"'127.0.0.0\/255.0.0.0'"/"'0.0.0.0\/0.0.0.0','::0'"/g etc/web2ldap/web2ldapcnf/standalone.py USER web2ldap EXPOSE 1760 -CMD sbin/web2ldap.py && tail -F var/log/web2ldap_error_log \ No newline at end of file +CMD sbin/web2ldap.py && tail -F var/log/web2ldap_error_log diff --git a/requirements.txt b/requirements.txt index d542249..3e85ae7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1 @@ -pyweblib==1.3.11 -pyasn1==0.1.7 -pyasn1-modules==0.0.5 -netaddr==0.7.14 \ No newline at end of file +pyweblib==1.3.12 From 22ab5b9aa48d52cdf40fc6b17e01c6e105303fce Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 24 Oct 2016 13:29:39 +0800 Subject: [PATCH 2/2] workaround docker hub overlayfs issue --- Dockerfile | 4 +--- requirements.txt | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 requirements.txt diff --git a/Dockerfile b/Dockerfile index 66559fd..35fbdf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,9 +20,7 @@ RUN apt-get update && \ ENV PYTHONPATH "/usr/local/lib/python2.7/site-packages" -COPY requirements.txt / - -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir pyweblib==1.3.12 RUN useradd web2ldap diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 3e85ae7..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -pyweblib==1.3.12