Commit 1d5ad22d authored by focus's avatar focus

update

parent a7987d8e
...@@ -166,6 +166,7 @@ ...@@ -166,6 +166,7 @@
<table name="pi_h5_share_log" primaryKey="id" dataNode="h5_service_$1-8" autoIncrement="false" rule="mod-ent-id" /> <table name="pi_h5_share_log" primaryKey="id" dataNode="h5_service_$1-8" autoIncrement="false" rule="mod-ent-id" />
<table name="pi_h5_statistics" primaryKey="id" dataNode="h5_service_$1-8" autoIncrement="false" rule="mod-ent-id" /> <table name="pi_h5_statistics" primaryKey="id" dataNode="h5_service_$1-8" autoIncrement="false" rule="mod-ent-id" />
<table name="pi_h5_visit_log" primaryKey="id" dataNode="h5_service_$1-8" autoIncrement="false" rule="mod-ent-id" /> <table name="pi_h5_visit_log" primaryKey="id" dataNode="h5_service_$1-8" autoIncrement="false" rule="mod-ent-id" />
<table name="pi_h5_prize_log" primaryKey="id" dataNode="h5_service_$1-8" autoIncrement="false" rule="mod-ent-id" />
</schema> </schema>
......
...@@ -6,7 +6,6 @@ MAINTAINER focus@hudongpai.com ...@@ -6,7 +6,6 @@ MAINTAINER focus@hudongpai.com
ENV ORANGE_PATH /usr/local/orange ENV ORANGE_PATH /usr/local/orange
ENV LOR_VERSION 0.2.6 ENV LOR_VERSION 0.2.6
ENV ORANGE_VERSION 0.6.0 ENV ORANGE_VERSION 0.6.0
ENV RUN_ENV dev
#timezone change #timezone change
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai
...@@ -62,9 +61,9 @@ RUN \ ...@@ -62,9 +61,9 @@ RUN \
&& echo "www:www" | chpasswd \ && echo "www:www" | chpasswd \
&& echo "www ALL=(ALL) ALL" >> /etc/sudoers && echo "www ALL=(ALL) ALL" >> /etc/sudoers
ADD conf-dev ${ORANGE_PATH}/conf-dev # ADD conf-dev ${ORANGE_PATH}/conf-dev
ADD conf-sandbox ${ORANGE_PATH}/conf-sandbox # ADD conf-sandbox ${ORANGE_PATH}/conf-sandbox
ADD conf-prod ${ORANGE_PATH}/conf-prod # ADD conf-prod ${ORANGE_PATH}/conf-prod
RUN \ RUN \
mkdir -p ${ORANGE_PATH}/logs \ mkdir -p ${ORANGE_PATH}/logs \
...@@ -83,6 +82,8 @@ RUN \ ...@@ -83,6 +82,8 @@ RUN \
cp docker-entrypoint.sh /usr/local/bin \ cp docker-entrypoint.sh /usr/local/bin \
&& chmod 755 /usr/local/bin/docker-entrypoint.sh && chmod 755 /usr/local/bin/docker-entrypoint.sh
VOLUME ["/usr/local/orange/conf"]
EXPOSE 7777 8888 9999 EXPOSE 7777 8888 9999
# Daemon # Daemon
......
...@@ -3,8 +3,8 @@ ORANGE_CONF="/usr/local/orange/conf/orange.conf" ...@@ -3,8 +3,8 @@ ORANGE_CONF="/usr/local/orange/conf/orange.conf"
NGINX_CONF="/usr/local/orange/conf/nginx.conf" NGINX_CONF="/usr/local/orange/conf/nginx.conf"
#over configuration file #over configuration file
rm -rf /usr/local/orange/conf/* # rm -rf /usr/local/orange/conf/*
cp -a /usr/local/orange/conf-${RUN_ENV}/* /usr/local/orange/conf/ # cp -a /usr/local/orange/conf-${RUN_ENV}/* /usr/local/orange/conf/
chown -R www:www /usr/local/orange/* chown -R www:www /usr/local/orange/*
# DNS resolve for nginx # DNS resolve for nginx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment