升级

Author: chenyongze

Dockerfile

@@ -14,12 +14,10 @@ ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
 RUN apk add --no-cache --virtual .build-deps \
     tzdata \
     && cp /usr/share/zoneinfo/${TZ} /etc/localtime \
-    && echo "${TZ}" > /etc/timezone \
-    && apk del .build-deps
+    && echo "${TZ}" > /etc/timezone
 
 RUN apk add --no-cache --virtual .build-deps \
     $PHPIZE_DEPS \
-    supervisor \
     libpng \
     curl \
     g++ \
@@ -68,7 +66,6 @@ RUN apk add --no-cache --virtual .build-deps \
     && docker-php-source delete \
     && pecl clear-cache
 
-
 # Copy php configuration files
 # COPY conf/php/etc/php-fpm.d/www.conf /usr/local/etc/php-fpm.d/www.conf
 COPY php/php.ini /usr/local/etc/php/php.ini 
@@ -221,14 +218,21 @@ RUN apk add --no-cache --virtual .build-deps \
     && ln -sf /dev/stdout /usr/local/openresty/nginx/logs/access.log \
     && ln -sf /dev/stderr /usr/local/openresty/nginx/logs/error.log
 
+RUN apk add --no-cache \
+    supervisor \
+    libstdc++ \
+    cyrus-sasl
+
 # Add additional binaries into PATH for convenience
 ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
 
 # # Copy nginx configuration files
 # COPY nginx.conf /usr/local/openresty/nginx/conf/nginx.conf
 # COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf
 COPY nginx/nginx.conf /usr/local/openresty/nginx/conf/nginx.conf 
-COPY nginx/conf.d /etc/nginx/conf.d 
+COPY nginx/conf.d /etc/nginx/conf.d
+COPY ./src /usr/local/openresty/nginx/html
+RUN mkdir -p /home/www-data/wwwlogs
 
 # CMD ["/usr/local/openresty/bin/openresty", "-g", "daemon off;"]
 
@@ -250,3 +254,4 @@ WORKDIR /usr/local/openresty/nginx/html
 EXPOSE 80 443 9000
 
 CMD ["/usr/bin/supervisord", "-n","-c", "/etc/supervisord.conf"]
+# ENTRYPOINT ["/usr/bin/supervisord", "-n","-c", "/etc/supervisord.conf"]

bash.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+# 部署项目
+# 重新构建
+
+set -e
+CURL_PATH=/app/docker-openresty-php-fpm
+cd /app/docker-openresty-php-fpm
+
+export_image() {
+    echo "[export] 开始 启动 "
+    docker export shengle-o-p >shengle-o-p.tar
+    echo "[export] 启动 完成"
+}
+
+import_image() {
+    echo "[import] 开始 启动 "
+    docker import ./shengle-o-p.tar s-o-p
+    echo "[import] 启动 完成"
+}
+
+stop() {
+    echo "[stop] 开始 启动 "
+    docker stop shengle-o-p
+    docker rm shengle-o-p
+    echo "[stop] 启动 完成"
+}
+
+start() {
+    echo "[start] 开始 启动 "
+    docker run -it -d -p 9080:80 -p 9443:443 \
+        -v $CURL_PATH/php/php.ini:/usr/local/etc/php/php.ini \
+        -v $CURL_PATH/php/php-fpm.d:/usr/local/etc/php-fpm.d \
+        -v $CURL_PATH/nginx/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf \
+        -v $CURL_PATH/nginx/conf.d:/etc/nginx/conf.d \
+        -v $CURL_PATH/supervisor/supervisord.conf:/etc/supervisord.conf \
+        -v $CURL_PATH/supervisor/conf.d:/etc/supervisor/conf.d \
+        -v /app:/app \
+        -v /app/wwwlogs:/home/www-data/wwwlogs \
+        --name shengle-o-p \
+        s-o-p \
+        /usr/bin/supervisord -n -c /etc/supervisord.conf
+    echo "[start] 启动 完成"
+}
+
+# 部署
+deploy() {
+    # 导出镜像
+    # export_image
+    # 导入镜像
+    import_image
+    # 停止镜像
+    stop
+    # 启动
+    start
+}
+
+deploy

deploy.sh

@@ -0,0 +1,39 @@
+导出镜像
+
+docker export shengle-o-p > shengle-o-p.tar
+
+导入镜像
+
+docker import shengle-o-p.tar shengle-o-p
+
+
+启动镜像
+
+docker run -it -d  -p 80:80 -p 443:443  -v /app/sldc-image-deploy/php/php-fpm.d:/usr/local/etc/php-fpm.d -v /app/sldc-image-deploy/nginx/conf.d:/etc/nginx/conf.d -v /app/wwwlogs:/home/www-data/wwwlogs -v /data/wwwroot:/var/www/html --name shengle-o-p s-o-p /usr/bin/supervisord -n -c /etc/supervisord.conf
+
+
+# 测试构建
+# 构建
+docker stop sop-test && docker rm sop-test && docker build -t yongze/sop-test . && docker run -it --name sop-test yongze/sop-test sh
+
+docker stop sop-test  && docker rm sop-test && docker run -it --name sop-test yongze/sop-test sh
+
+
+
+docker run -it --name sop-test yongze/sop-test sh
+
+
+docker build -t s-o-p .
+
+
+# 之前的 
+s-o-p   latest               be85912a9dc5        2 hours ago         229 MB
+nginx version: openresty/1.19.3.2
+PHP 7.2.10 (cli) (built: Sep 15 2018 02:49:26) ( NTS )
+
+# 之后的
+
+
+# 运行
+# 临时
+docker run -it yongze/sop-test sh

learn

@@ -50,6 +50,12 @@ server {
         access_log off;
     }
 
+    ## lua
+    location /_show_34 {
+        default_type text/plain;
+        content_by_lua 'ngx.say("hi api.._show_34....")';
+    }
+
     access_log /home/www-data/wwwlogs/api.shenglediancang.com.log sldc_access;
     error_log /home/www-data/wwwlogs/api.shenglediancang.com.error.log;
 }

nginx/conf.d/api.shenglediancang.com.conf

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name localhost;
+    server_name localhost _;
 
     #charset koi8-r;
     #access_log  /var/log/nginx/host.access.log  main;