diff --git a/Dockerfile b/Dockerfile index 10a846a..4592355 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ -FROM ubuntu:12.04 +FROM ubuntu:16.04 MAINTAINER Caroline Salib RUN apt-get -y update \ - && apt-get -y upgrade \ - && apt-get install -y apache2 php5 libapache2-mod-php5 php5-pgsql php-pear rpl wget \ + && apt-get install -y curl php-curl git-core apache2 libapache2-mod-php php-pgsql php-pear php-mbstring rpl wget \ && a2enmod rewrite \ && apt-get clean @@ -13,14 +12,14 @@ RUN apt-get install -y libreadline6 libreadline6-dev make gcc zlib1g-dev # Instala pacotes pear RUN pear install XML_RPC2 Mail Net_SMTP Services_ReCaptcha -ADD ieducar.conf /etc/apache2/sites-available/default +ADD ieducar.conf /etc/apache2/sites-available/000-default.conf +CMD a2ensite 000-default.conf EXPOSE 80 -CMD mkdir /home/ieducar/ieducar -CMD chmod 777 -R /home/ieducar/ieducar -WORKDIR /home/ieducar/ieducar - +CMD mkdir /var/www/html/i-educar +CMD chmod 777 -R /var/www/html/i-educar +WORKDIR /var/www/html/i-educar CMD /usr/sbin/apache2ctl -D FOREGROUND diff --git a/docker-compose.yml b/docker-compose.yml index 2fb9df6..5c1e84b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,14 @@ -ieducar_1204: +ieducar_1604: build: . environment: - CORE_EXT_CONFIGURATION_ENV=development ports: - - "8001:80" + - "8080:80" volumes: - - .:/home/ieducar/ieducar + - .:/var/www/html/i-educar/ links: - postgres95 - container_name: ieducar_1204 + container_name: ieducar_1604 postgres95: volumes: diff --git a/ieducar.conf b/ieducar.conf index 5c850f8..aa820b8 100644 --- a/ieducar.conf +++ b/ieducar.conf @@ -1,11 +1,9 @@ - ServerName ieducar.local - DocumentRoot /home/ieducar/ieducar/ieducar - + DocumentRoot /var/www/html/i-educar/ieducar + Order deny,allow AllowOverride all - - + \ No newline at end of file -- libgit2 0.21.2