xai-corp.net/provisioning
1
0
Fork 0
Code Issues 9 Releases Activity

fix launch script bugs

Browse Source
This commit is contained in:
Richard Morgan
2018-12-16 10:42:22 -05:00
parent 5c6228b6d6
commit 2ac287d4de
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dockerfiles/services/sslproxy/docker-compose-prod.yml
View File

@@ -19,12 +19,12 @@ services:
- "443:443" - "443:443"
- "80:80" # required for letsencrypt - "80:80" # required for letsencrypt
healthcheck: # healthcheck:
test: ["CMD", "wget", "--spider", "--header", "'Host: dkui.xai-corp.net'", "https://localhost/"] # test: ["CMD", "wget", "--spider", "--header", "'Host: dkui.xai-corp.net'", "https://localhost/"]
interval: 1m30s # interval: 1m30s
timeout: 5s # timeout: 5s
retries: 3 # retries: 3
start_period: 10s # start_period: 10s
logging: logging:
driver: fluentd driver: fluentd

7
dockerfiles/services/sslproxy/hosts/git.xai-corp.net.conf
View File

@@ -2,14 +2,13 @@ proxy_cache_path /data/nginx/cache/gitea levels=1:2 keys_zone=gitea:10m max_size
inactive=60m use_temp_path=off; inactive=60m use_temp_path=off;
upstream gitea_upstream { upstream gitea_upstream {
server tasks.gitea_app:10080; server dkhost.xai-corp.net:10080;
server dkhost.xai-corp.net:10080 backup;
} }
# git.xai-corp.net # git.xai-corp.net
server { server {
listen 443 ssl ipv6only=off; listen 443 ipv6only=off;
listen [::]:43 ipv6only=on;
server_name git.xai-corp.net; server_name git.xai-corp.net;
ssl_certificate /etc/letsencrypt/live/xai-corp.net/fullchain.pem; ssl_certificate /etc/letsencrypt/live/xai-corp.net/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/xai-corp.net/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/xai-corp.net/privkey.pem;

2
dockerfiles/tasks/dev-php7.0/Dockerfile-71
View File

@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y software-properties-common python-softw
&& apt-get update && apt-get install -y \ && apt-get update && apt-get install -y \
curl nano sed libwww-perl htop ca-certificates \ curl nano sed libwww-perl htop ca-certificates \
php7.1 php7.1-cli php7.1-fpm php-curl php-pear php-mcrypt php-zip php-mbstring php7.1-xml \ php7.1 php7.1-cli php7.1-fpm php-curl php-pear php-mcrypt php-zip php-mbstring php7.1-xml \
php-pgsql php-redis php-soap \ php-mysql php-pgsql php-redis php-soap \
\ \
&& apt-cache pkgnames | grep php7.1 \ && apt-cache pkgnames | grep php7.1 \
&& rm /usr/bin/php && ln -s /usr/bin/php7.1 /usr/bin/php \ && rm /usr/bin/php && ln -s /usr/bin/php7.1 /usr/bin/php \

6
dockerfiles/tasks/dev-php7.0/build.sh
View File

@@ -18,6 +18,9 @@ docker run --rm --entrypoint php xaicorp/php:7.1-dev --version | grep 'Xdebug'
docker tag xaicorp/php:7.1-dev dkregistry.xai-corp.net:5000/xaicorp/php:7.1-dev docker tag xaicorp/php:7.1-dev dkregistry.xai-corp.net:5000/xaicorp/php:7.1-dev
docker push dkregistry.xai-corp.net:5000/xaicorp/php:7.1-dev docker push dkregistry.xai-corp.net:5000/xaicorp/php:7.1-dev
docker tag xaicorp/php:7.1-dev rmorgan/php-fpm:7.1
docker build --rm -f Dockerfile-72 -t xaicorp/php:7.2 . docker build --rm -f Dockerfile-72 -t xaicorp/php:7.2 .
docker build --rm -f Dockerfile-72-dev -t xaicorp/php:7.2-dev . docker build --rm -f Dockerfile-72-dev -t xaicorp/php:7.2-dev .
docker run --rm --entrypoint php xaicorp/php:7.2 --version | grep 'PHP 7.2.' docker run --rm --entrypoint php xaicorp/php:7.2 --version | grep 'PHP 7.2.'
@@ -25,3 +28,6 @@ docker run --rm --entrypoint php xaicorp/php:7.2-dev --version | grep 'PHP 7.2.'
docker run --rm --entrypoint php xaicorp/php:7.2-dev --version | grep 'Xdebug' docker run --rm --entrypoint php xaicorp/php:7.2-dev --version | grep 'Xdebug'
docker tag xaicorp/php:7.2-dev dkregistry.xai-corp.net:5000/xaicorp/php:7.2-dev docker tag xaicorp/php:7.2-dev dkregistry.xai-corp.net:5000/xaicorp/php:7.2-dev
docker push dkregistry.xai-corp.net:5000/xaicorp/php:7.2-dev docker push dkregistry.xai-corp.net:5000/xaicorp/php:7.2-dev
docker tag xaicorp/php:7.2-dev rmorgan/php-fpm:7.2
docker tag xaicorp/php:7.1-dev rmorgan/php-fpm:latest