Commit fcb5c703 authored by jlopez's avatar jlopez
Browse files

Merge branch 'develop' into 'master' 

Develop

Closes #14

See merge request !2
parents 28bb7c97 3d3b9262

.docker/web/Dockerfile

deleted100644 → 0
+1 −30
Original line number Diff line number Diff line 
FROM alpine:3.9



LABEL Author remyd1 - https://github.com/remyd1

RUN apk --update add php-apache2 php7-session php7-mysqli && rm -f /var/cache/apk/*





RUN mkdir /app && cd /app && \

  wget https://gitlab.mbb.univ-montp2.fr/jlopez/wicopa/-/archive/v0.4/wicopa-v0.4.tar.gz && \

  tar -xf wicopa-v0.4.tar.gz && ln -s wicopa-v0.4 wicopa && \

  cp wicopa/conf/Conf.php.sample wicopa/conf/Conf.php && \

  chown -R apache:apache /app && \

  sed -i "s#DB_NAME       = ''#DB_NAME       = 'wicopa'#" wicopa/conf/Conf.php && \

  sed -i "s#DB_HOSTNAME   = ''#DB_HOSTNAME   = 'wicopadb'#" wicopa/conf/Conf.php && \

  sed -i "s#DB_USERNAME   = ''#DB_USERNAME   = 'wicopauser'#" wicopa/conf/Conf.php && \

  sed -i "s#DB_PP         = ''#DB_PP         = 'w1c0Pa5s'#" wicopa/conf/Conf.php && \

  sed -i "s#'to_replace_with_your_admin_pass'#'450cb0c92db35549cb926efc391df2ceae4b48d1'#" wicopa/conf/Conf.php



RUN sed -i 's/^#ServerName .*/ServerName localhost:80/g' /etc/apache2/httpd.conf && \

  sed -i 's#/var/www/localhost/htdocs#/app/wicopa#g' /etc/apache2/httpd.conf && \

  sed -i 's/^LoadModule php7_module.*/LoadModule php7_module modules\/libphp7\.so/g' /etc/apache2/httpd.conf && \

  sed -i 's/DirectoryIndex index\.html/DirectoryIndex index\.php/g' /etc/apache2/httpd.conf && \

  sed -ri 's#^DocumentRoot .*#DocumentRoot "/app/wicopa"#g' /etc/apache2/httpd.conf && \

  sed -i 's#AllowOverride None#AllowOverride All#g' /etc/apache2/httpd.conf && \

  echo "AddType application/x-httpd-php .php" >> /etc/apache2/httpd.conf



RUN echo "Success"



EXPOSE 80



ENTRYPOINT httpd -D FOREGROUND && /bin/bash

.docker/web/Dockerfile

0 → 120000
+1 −30
Original line number Diff line number Diff line 
Dockerfile.develop
 
 No newline at end of file

.docker/web/Dockerfile.develop

0 → 100644
+33 −0
Original line number Diff line number Diff line 
FROM alpine:3.9



LABEL Author remyd1 - https://github.com/remyd1

RUN apk --update add php-apache2 php7-session php7-mysqli git && rm -f /var/cache/apk/*





RUN mkdir /app && cd /app && \

  git clone https://gitlab.mbb.univ-montp2.fr/jlopez/wicopa.git



WORKDIR /app/wicopa



RUN git checkout develop && \

  cp inc/conf/Conf.php.sample inc/conf/Conf.php && \

  chown -R apache:apache /app && \

  sed -i "s#DB_NAME       = ''#DB_NAME       = 'wicopa'#"      inc/conf/Conf.php && \

  sed -i "s#DB_HOSTNAME   = ''#DB_HOSTNAME   = 'wicopadb'#"    inc/conf/Conf.php && \

  sed -i "s#DB_USERNAME   = ''#DB_USERNAME   = 'wicopauser'#"  inc/conf/Conf.php && \

  sed -i "s#DB_PP         = ''#DB_PP         = 'w1c0Pa5s'#"    inc/conf/Conf.php && \

  sed -i "s#'to_replace_with_your_admin_pass'#'450cb0c92db35549cb926efc391df2ceae4b48d1'#" inc/conf/Conf.php



RUN sed -i 's/^#ServerName .*/ServerName localhost:80/g' /etc/apache2/httpd.conf && \

  sed -i 's#/var/www/localhost/htdocs#/app/wicopa#g' /etc/apache2/httpd.conf && \

  sed -i 's/^LoadModule php7_module.*/LoadModule php7_module modules\/libphp7\.so/g' /etc/apache2/httpd.conf && \

  sed -i 's/DirectoryIndex index\.html/DirectoryIndex index\.php/g' /etc/apache2/httpd.conf && \

  sed -ri 's#^DocumentRoot .*#DocumentRoot "/app/wicopa"#g' /etc/apache2/httpd.conf && \

  sed -i 's#AllowOverride None#AllowOverride All#g' /etc/apache2/httpd.conf && \

  echo "AddType application/x-httpd-php .php" >> /etc/apache2/httpd.conf



RUN echo "Success"



EXPOSE 80



ENTRYPOINT httpd -D FOREGROUND && /bin/bash

.docker/web/Dockerfile.stable

0 → 100644
+30 −0
Original line number Diff line number Diff line 
FROM alpine:3.9



LABEL Author remyd1 - https://github.com/remyd1

RUN apk --update add php-apache2 php7-session php7-mysqli && rm -f /var/cache/apk/*





RUN mkdir /app && cd /app && \

  wget https://gitlab.mbb.univ-montp2.fr/jlopez/wicopa/-/archive/v0.4/wicopa-v0.4.tar.gz && \

  tar -xf wicopa-v0.4.tar.gz && ln -s wicopa-v0.4 wicopa && \

  cp wicopa/inc/conf/Conf.php.sample wicopa/inc/conf/Conf.php && \

  chown -R apache:apache /app && \

  sed -i "s#DB_NAME       = ''#DB_NAME       = 'wicopa'#" wicopa/inc/conf/Conf.php && \

  sed -i "s#DB_HOSTNAME   = ''#DB_HOSTNAME   = 'wicopadb'#" wicopa/inc/conf/Conf.php && \

  sed -i "s#DB_USERNAME   = ''#DB_USERNAME   = 'wicopauser'#" wicopa/inc/conf/Conf.php && \

  sed -i "s#DB_PP         = ''#DB_PP         = 'w1c0Pa5s'#" wicopa/inc/conf/Conf.php && \

  sed -i "s#'to_replace_with_your_admin_pass'#'450cb0c92db35549cb926efc391df2ceae4b48d1'#" wicopa/inc/conf/Conf.php



RUN sed -i 's/^#ServerName .*/ServerName localhost:80/g' /etc/apache2/httpd.conf && \

  sed -i 's#/var/www/localhost/htdocs#/app/wicopa#g' /etc/apache2/httpd.conf && \

  sed -i 's/^LoadModule php7_module.*/LoadModule php7_module modules\/libphp7\.so/g' /etc/apache2/httpd.conf && \

  sed -i 's/DirectoryIndex index\.html/DirectoryIndex index\.php/g' /etc/apache2/httpd.conf && \

  sed -ri 's#^DocumentRoot .*#DocumentRoot "/app/wicopa"#g' /etc/apache2/httpd.conf && \

  sed -i 's#AllowOverride None#AllowOverride All#g' /etc/apache2/httpd.conf && \

  echo "AddType application/x-httpd-php .php" >> /etc/apache2/httpd.conf



RUN echo "Success"



EXPOSE 80



ENTRYPOINT httpd -D FOREGROUND && /bin/bash

.gitignore

+1 −1
Original line number Diff line number Diff line 
wicopa.sql

conf/Conf.php

inc/conf/Conf.php

*.swp

.docker/db/wicopa/*