Преглед на файлове

bug fix to install elgg

Kévio Castro преди 11 години
родител
ревизия
5db195cdb5
променени са 3 файла, в които са добавени 31 реда и са изтрити 27 реда
  1. 16 17
      Dockerfile
  2. 12 9
      docker-compose.yml
  3. 3 1
      docker-install.php

+ 16 - 17
Dockerfile

@@ -1,19 +1,18 @@
 FROM php:5.6-apache
 COPY docker_config/php.ini /usr/local/etc/php/
-COPY . /var/www/html/ 
+#COPY ~/www/Elgg/ /var/www/html/ 
 
-#RUN apt-get update && apt-get install -y apt-utils pwgen 
-
-# Elgg requirements
+	# Elgg requirements
 RUN apt-get update && apt-get install -y \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
         libmcrypt-dev \
-        libpng12-dev \
-    	&& docker-php-ext-install gd \
-    	&& docker-php-ext-install pdo \
-    	&& docker-php-ext-install mysql \
-    	&& docker-php-ext-install mbstring
+        libpng12-dev 
+
+RUN docker-php-ext-install pdo pdo_mysql mysql
+RUN docker-php-ext-install mbstring gd
+
+WORKDIR /var/www/html
 
 
 # Email server
@@ -29,24 +28,25 @@ RUN cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime
 
 # set defaults or env vars for Elgg and MySQL
 # MySQL
-ENV MYSQL_USER=${MYSQL_USER:-"admin"}
+ENV MYSQL_USER=${MYSQL_USER:-"root"}
 ENV MYSQL_PASS=${MYSQL_PASS:-"123123"}
 
 # required for installation
-ENV ELGG_DB_HOST=${ELGG_DB_HOST:-"127.0.0.1"}
+ENV ELGG_DB_HOST=${ELGG_DB_HOST:-"mysql"}
 ENV ELGG_DB_USER=$MYSQL_USER
 ENV ELGG_DB_PASS=$MYSQL_PASS
 ENV ELGG_DB_NAME=${ELGG_DB_NAME:-"elgg"}
 
 ENV ELGG_SITE_NAME=${ELGG_SITE_NAME:-"Elgg Site"}
-# Elgg requires a FQDN for the email address.
-ENV ELGG_SITE_EMAIL=${ELGG_SITE_EMAIL:-"no-reply@${HOSTNAME}"}
-ENV ELGG_WWW_ROOT=${ELGG_WWW_ROOT:-"http://localhost:${PORT}"}
 ENV ELGG_DATA_ROOT=${ELGG_DATA_ROOT:-"/media/elgg/"}
+ENV ELGG_WWW_ROOT=${ELGG_WWW_ROOT:-"http://localhost:8000"}
+
+# Elgg requires a FQDN for the email address.
+#ENV ELGG_SITE_EMAIL=${ELGG_SITE_EMAIL:-"no-reply@myelgg.org"}
 
 # admin user setup
-ENV ELGG_DISPLAY_NAME=${ELGG_DISPLAY_NAME:-"admin"}
-ENV ELGG_EMAIL=${ELGG_EMAIL:-"elgg-admin@${HOSTNAME}"}
+ENV ELGG_DISPLAY_NAME=${ELGG_DISPLAY_NAME:-"Admin"}
+ENV ELGG_EMAIL=${ELGG_EMAIL:-"admin@myelgg.org"}
 ENV ELGG_USERNAME=${ELGG_USERNAME:-"admin"}
 ENV ELGG_PASSWORD=${ELGG_PASSWORD:-"123123"}
 
@@ -61,4 +61,3 @@ COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 RUN /docker-entrypoint.sh
 
-# ENTRYPOINT ['php', 'docker-entrypoint.sh'] 

+ 12 - 9
docker-compose.yml

@@ -1,11 +1,14 @@
 web:
-	build: .
-	port: 
-		- "8000:80"
-	links: 
-		- mysql
+  build: .
+  ports:
+    - "8000:80"
+  links:
+    - mysql
+  volumes:
+    - ~/www/Elgg/:/var/www/html/
+    - .:/var/www/html/elgg-docker/
 mysql:
-	image: mysql:5.7
-	environment:
-		MYSQL_ROOT_PASSWORD: 123123
-		MYSQL_DATABASE: elgg
+  image: mysql:5.7  
+  environment:
+    MYSQL_DATABASE: elgg
+    MYSQL_ROOT_PASSWORD: 123123

+ 3 - 1
docker-install.php

@@ -30,6 +30,8 @@ $params = array(
 	'path' => getenv('ELGG_PATH')
 );
 
-$installer->batchInstall($params, true);
+
+
+$installer->batchInstall($params, false);
 
 exit(0);