pgadmin ~działa

images/ldapadmin/Dockerfile

@@ -0,0 +1,17 @@
+FROM plug/php-fpm
+MAINTAINER Michał "rysiek" Woźniak <rysiek@hackerspace.pl>
+
+ENV APP_NAME "ldapadmin"
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && apt-get install -y --no-install-recommends git
+
+RUN git clone -b master --single-branch https://github.com/leenooks/phpLDAPadmin.git /opt/ldapadmin \
+ && rm -rf /opt/ldapadmin/.git \
+ && chown -R www-data:www-data /opt/ldapadmin
+
+RUN apt-get purge -y git \
+ && apt-get autoremove -y
+
+# needed for nginx
+VOLUME ["/opt/ldapadmin/"]

images/pgadmin/Dockerfile

@@ -4,15 +4,14 @@ MAINTAINER Michał "rysiek" Woźniak <rysiek@hackerspace.pl>
 ENV APP_NAME "pgadmin"
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && apt-get install -y --no-install-recommends git \
- && git clone -b REL_5-1 --single-branch https://github.com/phppgadmin/phppgadmin.git /opt/php/pgadmin \
- && rm -rf /opt/php/pgadmin/.git \
- && chown -R www-data:www-data /opt/php/pgadmin \
- && apt-get purge -y git \
- && apt-get autoremove -y \
- && ls -l /opt/php/pgadmin
+RUN apt-get update && apt-get install -y --no-install-recommends git
 
-RUN ls -l /opt/php/pgadmin
+RUN git clone -b REL_5-1 --single-branch https://github.com/phppgadmin/phppgadmin.git /opt/pgadmin \
+ && rm -rf /opt/pgadmin/.git \
+ && chown -R www-data:www-data /opt/pgadmin
+ 
+RUN apt-get purge -y git \
+ && apt-get autoremove -y
 
 # needed for nginx
-#VOLUME ["/opt/php/pgadmin/"]
+VOLUME ["/opt/pgadmin/"]

images/php-fpm/Dockerfile

@@ -24,6 +24,9 @@ ADD pool.conf /etc/php5/fpm/pool.d/pool.conf
 # startup wrapper
 ADD start.sh /var/lib/php5/start
 
+# make sure the PHP dir exists
+RUN mkdir /opt/php && chown $APP_USER:$APP_GROUP /opt/php
+
 # info
 RUN echo " \n\
  \n\
@@ -38,7 +41,8 @@ RUN echo " \n\
  ******************************************************** \n\n\
  "
 
-VOLUME ["/var/run/php-fpm", "/var/log/php-fpm", "/opt/php"]
+# volumes
+VOLUME ["/var/run/php-fpm", "/var/log/php-fpm"]
 
 CMD ["/var/lib/php5/start"]
 ENTRYPOINT ["/bin/bash"]

images/php-fpm/start.sh

@@ -17,11 +17,13 @@ echo "\$APP_NAME  :: $APP_NAME"
 echo "\$APP_USER  :: $APP_USER"
 echo "\$APP_GROUP :: $APP_GROUP"
 
-# log and run
+# log, run and data
 mkdir -p /var/log/php-fpm
 mkdir -p /var/run/php-fpm
+mkdir -p /opt/php
 chown $APP_USER:$APP_GROUP /var/log/php-fpm
 chown $APP_USER:$APP_GROUP /var/run/php-fpm
+chown $APP_USER:$APP_GROUP /opt/php
 
 # php.ini customizations.
 sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 10M/g" /etc/php5/fpm/php.ini

setup.sh

@@ -52,7 +52,7 @@ if [[ "$mode" == "" || "$mode" == "--build" ]]; then
 
   # budujemy nowy dom...
   cd images/
-  for img in *; do
+  for img in postgres php-fpm nginx pgadmin cron; do
     # informujemy
     echo -ne "\n\n - buduję: $prefix/$img\n"
     # budujemy
@@ -191,7 +191,7 @@ if [[ "$mode" == "" || "$mode" == "--run" ]]; then
 
   # - pgadmin
   docker run -d \
-  -v "$static_data_dir/configs/pgadmin/":/opt/php/pgadmin/conf/:ro \
+  -v "$static_data_dir/configs/pgadmin/":/opt/pgadmin/conf/:ro \
   -v "$static_data_dir/logs/php-fpm/":/var/log/php-fpm \
   -v "$static_data_dir/run/php-fpm/":/var/run/php-fpm \
   --link $cnt_postgres:$cnt_postgres \

static_data/configs/nginx-internal/001-pgadmin.conf

@@ -6,7 +6,7 @@ server {
 
   listen 80;
   server_name pgadmin;
-  root /opt/php/pgadmin;
+  root /opt/pgadmin;
   access_log /var/log/nginx/pgadmin-access.log;
   error_log /var/log/nginx/pgadmin-error.log;
   

static_data/configs/nginx-internal/002-ldapadmin.conf

@@ -6,7 +6,7 @@ server {
 
   listen 80;
   server_name ldapadmin;
-  root /opt/php/ldapadmin;
+  root /opt/ldapadmin;
   access_log /var/log/nginx/ldapadmin-access.log;
   error_log /var/log/nginx/ldapadmin-error.log;