← Back to branch summary

~kick-d/+junk/owncloud-docker-create

« back to all changes in this revision

Viewing changes to Dockerfile

  • Committer: Pierre-André MOREY
  • Date: 2015-04-22 19:52:58 UTC
  • Revision ID: pierre-andre.morey@canonical.com-20150422195258-xm7macaqf3uv0vh0
Recover Dockerfile.amd64, put back amd64 to default

Show diffs side-by-side

added added

removed removed

Lines of Context:
Dockerfile
4
4
#be able to upgrade. To execute this container you need to give it a 
5
5
#data directory from the Host machine.
6
6
 
7
 
FROM kickinz1/ubuntu-armhf
 
7
FROM kickinz1/ubuntu
8
8
MAINTAINER <pierre-andre.morey@canonical.com>
9
9
 
10
10
#Make use of apt-cacher-ng if it exists:
11
 
#RUN  echo 'Acquire::http { Proxy "http://192.168.0.52:3142"; };' >> /etc/apt/apt.conf.d/01proxy
 
11
RUN  echo 'Acquire::http { Proxy "http://192.168.0.52:3142"; };' >> /etc/apt/apt.conf.d/01proxy
12
12
 
13
13
#Update base image:
14
14
RUN ["/bin/bash","-c","apt-get update && apt-get upgrade -y && apt-get clean && apt-get autoremove"]
15
15
#No ffmpeg for now
16
 
#RUN ["/bin/bash","-c","apt-get install -y software-properties-common && add-apt-repository -y ppa:mc3man/trusty-media && apt-get update"]
 
16
RUN ["/bin/bash","-c","apt-get install -y software-properties-common && add-apt-repository -y ppa:mc3man/trusty-media && apt-get update"]
17
17
 
18
18
#Sqlite packages installation:
19
19
RUN ["/bin/bash","-c","apt-get install -y sqlite3"]
22
22
RUN ["/bin/bash","-c","apt-get install -y apache2 libapache2-mod-php5 nano"]
23
23
 
24
24
#Php5 packages installation:
25
 
RUN ["/bin/bash","-c","apt-get install -y php5-gd php5-json php5-sqlite php5-curl php5-intl php5-mcrypt php5-imagick php-net-ftp php5-gmp php-apc php5-apcu php5-imagick"]
 
25
RUN ["/bin/bash","-c","apt-get install -y php5-gd php5-json php5-sqlite php5-curl php5-intl php5-mcrypt php5-imagick php-net-ftp php5-gmp php-apc php5-apcu php5-imagicki ffmpeg"]
26
26
 
27
27
#Post configuration:
28
28
ENV APACHE_RUN_USER www-data
31
31
ENV APACHE_LOCK_DIR /var/lock/apache2
32
32
ENV APACHE_PID_FILE /var/run/apache2.pid
33
33
 
34
 
#RUN sed -i "s,DocumentRoot /var/www/html,DocumentRoot /var/www," /etc/apache2/sites-available/000-default.conf
 
34
RUN sed -i "s,DocumentRoot /var/www/html,DocumentRoot /var/www," /etc/apache2/sites-available/000-default.conf
35
35
RUN sed -i 's,;default_charset = "UTF-8",default_charset = "UTF-8",' /etc/php5/apache2/php.ini
36
36
 
37
37
RUN ["/usr/sbin/a2enmod","ssl"]