Download as
Browse Code »

Commit 26d68c661604a25f57ea2674763bb6b7fde1bec5

Authored by Caroline Salib
1 parent ca8c3354
Exists in master

Ajustado docker para rodar no ubuntu 16.04; 

portabilis/ieducar#189
Showing 3 changed files with 14 additions and 17 deletions   Show diff stats
1 -FROM ubuntu:12.04 1 +FROM ubuntu:16.04
2 2
3 MAINTAINER Caroline Salib <caroline@portabilis.com.br> 3 MAINTAINER Caroline Salib <caroline@portabilis.com.br>
4 4
5 RUN apt-get -y update \ 5 RUN apt-get -y update \
6 - && apt-get -y upgrade \  
7 - && apt-get install -y apache2 php5 libapache2-mod-php5 php5-pgsql php-pear rpl wget \ 6 + && apt-get install -y curl php-curl git-core apache2 libapache2-mod-php php-pgsql php-pear php-mbstring rpl wget \
8 && a2enmod rewrite \ 7 && a2enmod rewrite \
9 && apt-get clean 8 && apt-get clean
10 9
@@ -13,14 +12,14 @@ RUN apt-get install -y libreadline6 libreadline6-dev make gcc zlib1g-dev @@ -13,14 +12,14 @@ RUN apt-get install -y libreadline6 libreadline6-dev make gcc zlib1g-dev
13 # Instala pacotes pear 12 # Instala pacotes pear
14 RUN pear install XML_RPC2 Mail Net_SMTP Services_ReCaptcha 13 RUN pear install XML_RPC2 Mail Net_SMTP Services_ReCaptcha
15 14
16 -ADD ieducar.conf /etc/apache2/sites-available/default 15 +ADD ieducar.conf /etc/apache2/sites-available/000-default.conf
  16 +CMD a2ensite 000-default.conf
17 17
18 EXPOSE 80 18 EXPOSE 80
19 19
20 -CMD mkdir /home/ieducar/ieducar  
21 -CMD chmod 777 -R /home/ieducar/ieducar  
22 -WORKDIR /home/ieducar/ieducar  
23 - 20 +CMD mkdir /var/www/html/i-educar
  21 +CMD chmod 777 -R /var/www/html/i-educar
  22 +WORKDIR /var/www/html/i-educar
24 23
25 CMD /usr/sbin/apache2ctl -D FOREGROUND 24 CMD /usr/sbin/apache2ctl -D FOREGROUND
26 25
docker-compose.yml
  Diff comments   View file @26d68c6
1 -ieducar_1204: 1 +ieducar_1604:
2 build: . 2 build: .
3 environment: 3 environment:
4 - CORE_EXT_CONFIGURATION_ENV=development 4 - CORE_EXT_CONFIGURATION_ENV=development
5 ports: 5 ports:
6 - - "8001:80" 6 + - "8080:80"
7 volumes: 7 volumes:
8 - - .:/home/ieducar/ieducar 8 + - .:/var/www/html/i-educar/
9 links: 9 links:
10 - postgres95 10 - postgres95
11 - container_name: ieducar_1204 11 + container_name: ieducar_1604
12 12
13 postgres95: 13 postgres95:
14 volumes: 14 volumes:
1 <VirtualHost *:80> 1 <VirtualHost *:80>
2 -  
3 ServerName ieducar.local 2 ServerName ieducar.local
4 - DocumentRoot /home/ieducar/ieducar/ieducar  
5 3
6 - <Directory /home/ieducar/ieducar/ieducar> 4 + DocumentRoot /var/www/html/i-educar/ieducar
  5 + <Directory /var/www/html/i-educar/ieducar>
7 Order deny,allow 6 Order deny,allow
8 AllowOverride all 7 AllowOverride all
9 </Directory> 8 </Directory>
10 -  
11 -</VirtualHost> 9 +</VirtualHost>
12 \ No newline at end of file 10 \ No newline at end of file