Index: dockerbuild/repnetweb/Dockerfile =================================================================== diff -u -rfb115ce6952ac58ec223c1fa95c5be24da562098 -r97b39798696fd56868c90e58cda0aed47f49a4d7 --- dockerbuild/repnetweb/Dockerfile (.../Dockerfile) (revision fb115ce6952ac58ec223c1fa95c5be24da562098) +++ dockerbuild/repnetweb/Dockerfile (.../Dockerfile) (revision 97b39798696fd56868c90e58cda0aed47f49a4d7) @@ -1,6 +1,8 @@ FROM ubuntu:bionic RUN echo 'Acquire::http { Proxy "http://10.2.40.126:3142"; };' > /etc/apt/apt.conf.d/01proxy +RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main restricted" >> /etc/apt/sources.list +RUN echo "deb http://archive.ubuntu.com/ubuntu xenial-updates main restricted" >> /etc/apt/sources.list RUN apt-get update && apt-get install -y less vim curl wget gnupg openssh-server openssh-client && \ curl http://10.2.40.126/lemansrepo/Lemans.gpg -o /etc/apt/trusted.gpg.d/Lemans.gpg && \ chmod 0444 /etc/apt/trusted.gpg.d/Lemans.gpg && \ @@ -15,22 +17,21 @@ chmod 711 /root/.ssh && \ echo "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHG07lLfJ7FDbcPehUQpo9BU+ehjR7L7P1hMxi7MN6Gc47DD72jwDgZHTIHxdS/Io1apVksyUXHDNAE36A4nspZCQF9eY37iFBZlWKNI5b2NOiQduEglIIrVNE+gBglhb8bsh2cY2nu8OWuRcss/20Ek5Ml2MywAAdSEoJF92/HW0/K3A== arons@dev-test01vb" > /root/.ssh/authorized_keys && \ chmod 644 /root/.ssh/authorized_keys -RUN echo "deb http://archive.ubuntu.com/ubuntu bionic-updates main restricted" >> /etc/apt/sources.list -RUN echo "deb http://archive.ubuntu.com/ubuntu bionic-updates universe restricted" >> /etc/apt/sources.list -RUN apt-get install -y libapache2-mod-php apache2-bin apache2 apache2-utils php7.2-ldap php7.2-mysql php7.2-cli php7.2-cgi php7.2-curl php7.2-gd ca-certificates-local && \ +RUN apt-get install -y apache2-bin apache2-utils libcurl3 php7.0-curl php7.0-common libapache2-mod-php7.0 php7.0-cli php-common php7.0-mysql php7.0-opcache libapache2-mod-auth-kerb && \ + #RUN apt-get install -y libapache2-mod-php apache2-bin apache2 apache2-utils php7.2-ldap php7.2-mysql php7.2-cli php7.2-cgi php7.2-curl php7.2-gd ca-certificates-local && \ echo "RequestHeader set X-UUID %{UNIQUE_ID}e" > /etc/apache2/mods-available/unique_id.conf && \ - a2enmod alias auth_basic authn_file authnz_ldap authz_groupfile authz_host authz_user autoindex cgi deflate env expires filter headers ldap mime negotiation php7.2 proxy proxy_ajp proxy_http reqtimeout rewrite setenvif status substitute unique_id -COPY /configs/repnetweb/a-configs-repnetweb/apache2.conf /etc/apache2/apache2.conf -COPY /configs/apache-prod.conf /etc/apache2/sites-enabled/000-default.conf + a2enmod alias auth_basic authn_file authnz_ldap authz_groupfile authz_host authz_user autoindex cgi deflate env expires filter headers ldap mime negotiation php7.0 proxy proxy_ajp proxy_http reqtimeout rewrite setenvif status substitute unique_id COPY /repnetweb-app.tgz /tmp/ RUN mkdir -p /var/www/repnetweb-app/ && cd /var/www/repnetweb-app; tar -zxf /tmp/repnetweb-app.tgz COPY /repnetweb-app-config.tgz /tmp/ RUN mkdir /var/www/configs/ && mkdir -p /var/www/configs/repnetweb && cd /var/www/configs/repnetweb; tar -zxf /tmp/repnetweb-app-config.tgz +COPY /configs/repnetweb/a-configs-repnetweb/apache2.conf /etc/apache2/apache2.conf +COPY /configs/apache-prod.conf /etc/apache2/sites-enabled/000-default.conf RUN mkdir /var/log/php && \ chown www-data. /var/log/php && \ touch /var/log/php_errors.log && \ chown www-data. /var/log/php_errors.log && \ - echo "error_log = /var/log/php_errors.log" >> /etc/php/7.2/apache2/php.ini && \ + echo "error_log = /var/log/php_errors.log" >> /etc/php/7.0/apache2/php.ini && \ echo "#!/bin/bash" > /root/startup && \ echo "/etc/init.d/ssh start" >> /root/startup && \ echo "killall -9 apache2" >> /root/startup && \