diff --git a/dockerfiles/services/sslproxy/docker-compose-prod.yml b/dockerfiles/services/sslproxy/docker-compose-prod.yml index 2a2a801..bd95b06 100644 --- a/dockerfiles/services/sslproxy/docker-compose-prod.yml +++ b/dockerfiles/services/sslproxy/docker-compose-prod.yml @@ -19,12 +19,12 @@ services: - "443:443" - "80:80" # required for letsencrypt - healthcheck: - test: ["CMD", "wget", "--spider", "--header", "'Host: dkui.xai-corp.net'", "https://localhost/"] - interval: 1m30s - timeout: 5s - retries: 3 - start_period: 10s +# healthcheck: +# test: ["CMD", "wget", "--spider", "--header", "'Host: dkui.xai-corp.net'", "https://localhost/"] +# interval: 1m30s +# timeout: 5s +# retries: 3 +# start_period: 10s logging: driver: fluentd diff --git a/dockerfiles/services/sslproxy/hosts/git.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/git.xai-corp.net.conf index 5ccd25f..830ad15 100644 --- a/dockerfiles/services/sslproxy/hosts/git.xai-corp.net.conf +++ b/dockerfiles/services/sslproxy/hosts/git.xai-corp.net.conf @@ -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; upstream gitea_upstream { - server tasks.gitea_app:10080; - - server dkhost.xai-corp.net:10080 backup; + server dkhost.xai-corp.net:10080; } # git.xai-corp.net server { - listen 443 ssl ipv6only=off; + listen 443 ipv6only=off; + listen [::]:43 ipv6only=on; server_name git.xai-corp.net; ssl_certificate /etc/letsencrypt/live/xai-corp.net/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/xai-corp.net/privkey.pem; diff --git a/dockerfiles/tasks/dev-php7.0/Dockerfile-71 b/dockerfiles/tasks/dev-php7.0/Dockerfile-71 index a8400e0..44680bf 100644 --- a/dockerfiles/tasks/dev-php7.0/Dockerfile-71 +++ b/dockerfiles/tasks/dev-php7.0/Dockerfile-71 @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y software-properties-common python-softw && apt-get update && apt-get install -y \ 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 \ - php-pgsql php-redis php-soap \ + php-mysql php-pgsql php-redis php-soap \ \ && apt-cache pkgnames | grep php7.1 \ && rm /usr/bin/php && ln -s /usr/bin/php7.1 /usr/bin/php \ diff --git a/dockerfiles/tasks/dev-php7.0/build.sh b/dockerfiles/tasks/dev-php7.0/build.sh index ff071f8..94de790 100755 --- a/dockerfiles/tasks/dev-php7.0/build.sh +++ b/dockerfiles/tasks/dev-php7.0/build.sh @@ -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 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-dev -t xaicorp/php:7.2-dev . 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 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 tag xaicorp/php:7.2-dev rmorgan/php-fpm:7.2 +docker tag xaicorp/php:7.1-dev rmorgan/php-fpm:latest