10h30/ols-docker-env
1
0
Fork 0
mirror of https://github.com/10h30/ols-docker-env.git synced 2026-05-12 15:21:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

add php ext, travis sleep 20

Browse Source
This commit is contained in:
Cold-Egg
2020-01-02 16:56:42 -05:00
parent f88309f31e
commit f079202051
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -32,7 +32,7 @@ install:
before_script: before_script:
- docker image ls - docker image ls
- sleep 15 - sleep 20
script: script:
- curl -Ik http://localhost:80/ - curl -Ik http://localhost:80/
bin/container/downloadctl.sh
+2 -2
View File
@@ -38,7 +38,7 @@ get_owner(){
} }
get_db_pass(){ get_db_pass(){
if [ ${VH_DOC_ROOT}/.db_pass ]; then if [ -f ${DEFAULT_VH_ROOT}/${1}/.db_pass ]; then
SQL_DB=$(grep -i Database ${VH_DOC_ROOT}/.db_pass | awk -F ':' '{print $2}' | tr -d '"') SQL_DB=$(grep -i Database ${VH_DOC_ROOT}/.db_pass | awk -F ':' '{print $2}' | tr -d '"')
SQL_USER=$(grep -i Username ${VH_DOC_ROOT}/.db_pass | awk -F ':' '{print $2}' | tr -d '"') SQL_USER=$(grep -i Username ${VH_DOC_ROOT}/.db_pass | awk -F ':' '{print $2}' | tr -d '"')
SQL_PASS=$(grep -i Password ${VH_DOC_ROOT}/.db_pass | awk -F ':' '{print $2}' | tr -d '"') SQL_PASS=$(grep -i Password ${VH_DOC_ROOT}/.db_pass | awk -F ':' '{print $2}' | tr -d '"')
@@ -74,7 +74,7 @@ check_sql_native(){
} }
preinstall_wordpress(){ preinstall_wordpress(){
get_db_pass get_db_pass ${DOMAIN}
if [ ! -f ${VH_DOC_ROOT}/wp-config.php ] && [ -f ${VH_DOC_ROOT}/wp-config-sample.php ]; then if [ ! -f ${VH_DOC_ROOT}/wp-config.php ] && [ -f ${VH_DOC_ROOT}/wp-config-sample.php ]; then
cp ${VH_DOC_ROOT}/wp-config-sample.php ${VH_DOC_ROOT}/wp-config.php cp ${VH_DOC_ROOT}/wp-config-sample.php ${VH_DOC_ROOT}/wp-config.php
NEWDBPWD="define('DB_PASSWORD', '${SQL_PASS}');" NEWDBPWD="define('DB_PASSWORD', '${SQL_PASS}');"
config/litespeed/1.6.4.lh/Dockerfile
+2 -1
View File
@@ -6,7 +6,8 @@ RUN apt-get update && apt-get install wget curl -y
RUN wget https://openlitespeed.org/preuse/openlitespeed-1.6.4.tgz && \ RUN wget https://openlitespeed.org/preuse/openlitespeed-1.6.4.tgz && \
tar xzvf openlitespeed-1.6.4.tgz && cd openlitespeed && ./install.sh && rm -rf /openlitespeed tar xzvf openlitespeed-1.6.4.tgz && cd openlitespeed && ./install.sh && rm -rf /openlitespeed
RUN apt-get install mysql-client lsphp73 lsphp73-mysql lsphp73-opcache lsphp73-curl lsphp73-json -y RUN apt-get install mysql-client lsphp73 lsphp73-common lsphp73-mbstring lsphp73-mysql lsphp73-opcache \
lsphp73-curl lsphp73-json lsphp73-imagick lsphp73-redis lsphp73-memcached -y
#RUN echo "admin:$(/usr/local/lsws/admin/fcgi-bin/admin_php* -q /usr/local/lsws/admin/misc/htpasswd.php ${WEB_ADMIN_PASSWORD})" \ #RUN echo "admin:$(/usr/local/lsws/admin/fcgi-bin/admin_php* -q /usr/local/lsws/admin/misc/htpasswd.php ${WEB_ADMIN_PASSWORD})" \
# > /usr/local/lsws/admin/conf/htpasswd # > /usr/local/lsws/admin/conf/htpasswd
config/litespeed/1.6.4.lh/conf/httpd_config.conf
+10
View File
@@ -223,8 +223,18 @@ listener Default {
listener HTTP { listener HTTP {
address *:80 address *:80
secure 0 secure 0
map Example *
} }
listener HTTPS {
address *:443
secure 1
keyFile /usr/local/lsws/admin/conf/webadmin.key
certFile /usr/local/lsws/admin/conf/webadmin.crt
map Example *
}
vhTemplate centralConfigLog { vhTemplate centralConfigLog {
templateFile conf/templates/ccl.conf templateFile conf/templates/ccl.conf
listeners Default listeners Default
config/litespeed/1.6.4/Dockerfile
+2 -1
View File
@@ -10,7 +10,8 @@ RUN apt-get install -y software-properties-common && \
add-apt-repository 'deb http://ftp.debian.org/debian jessie-backports main' && \ add-apt-repository 'deb http://ftp.debian.org/debian jessie-backports main' && \
apt-get update && apt-get install -y python-certbot-apache -t jessie-backports apt-get update && apt-get install -y python-certbot-apache -t jessie-backports
RUN apt-get install mysql-client lsphp73 lsphp73-mysql lsphp73-opcache lsphp73-curl lsphp73-json -y RUN apt-get install mysql-client lsphp73 lsphp73-common lsphp73-mbstring lsphp73-mysql lsphp73-opcache \
lsphp73-curl lsphp73-json lsphp73-imagick lsphp73-redis lsphp73-memcached -y
RUN echo "admin:$(/usr/local/lsws/admin/fcgi-bin/admin_php* -q /usr/local/lsws/admin/misc/htpasswd.php ${WEB_ADMIN_PASSWORD})" \ RUN echo "admin:$(/usr/local/lsws/admin/fcgi-bin/admin_php* -q /usr/local/lsws/admin/misc/htpasswd.php ${WEB_ADMIN_PASSWORD})" \
> /usr/local/lsws/admin/conf/htpasswd > /usr/local/lsws/admin/conf/htpasswd