Jelajahi Sumber

init project

yangxg 2 tahun lalu
induk
melakukan
995a8dad61
4 mengubah file dengan 5 tambahan dan 10 penghapusan
  1. 2 2
      .drone.yml
  2. 0 1
      Dockerfile
  3. 0 4
      entrypoint.sh
  4. 3 3
      nginx.conf

+ 2 - 2
.drone.yml

@@ -23,7 +23,7 @@ steps:
       mirror: https://ci7pm4nx.mirror.aliyuncs.com
       registry: hub.evbj.easou.com
       repo: hub.evbj.easou.com/pro/${DRONE_REPO_NAME}
-      tag: r8
+      tag: r9
      
   - name: deployment
     image: hub.evbj.easou.com/dev/drone-agent:v3.0.1
@@ -32,7 +32,7 @@ steps:
     environment:
       JNLP_ENV: pro
       JNLP_REPLICAS: 1
-      JNLP_TAG: r8
+      JNLP_TAG: r9
       JNLP_VERSION: v1  # default v1, v2 for canary
       DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
       JNLP_REPO: hub.evbj.easou.com

+ 0 - 1
Dockerfile

@@ -11,7 +11,6 @@ COPY entrypoint.sh /usr/bin/entrypoint.sh
 #install jdk8 & resin4
 
 RUN yum install -y epel-release wget rsync lsof crontabs vim psmisc nginx\
-    && /usr/sbin/groupadd -g 18001 book ;useradd -s /bin/bash  -g book -u 18001 book \
     && yum install -y supervisor \
     && mkdir -p /usr/java  /app/soft /cron/root \
     && curl -O http://10.26.22.113:9000/psop/soft/jdk1.8.0_271.tar.gz \

+ 0 - 4
entrypoint.sh

@@ -6,11 +6,7 @@ set -o pipefail
 chmod 600 /var/spool/cron/root
 chmod 600 /etc/rsync.qd
 sed -i -e '/pam_loginuid.so/s/^/#/' /etc/pam.d/crond
-mkdir -p /log/resin-books/search /log/cron/ /home/book/preps/.java/.userPrefs
 rm -rf /app/soft/resin-4.0.65/log/jvm-app-0.log
-touch /home/book/preps/.java/.userPrefs/.user.lock.book
-touch /home/book/preps/.java/.userPrefs/.userRootModFile.book
-chown book:book -R  /data /app/soft/ /home/book/preps /log/
 mkdir -p /data/logs/cron
 echo 'export JAVA_HOME=/usr/java/jdk1.8.0_271' >> /etc/profile
 echo 'export CLASSPATH=$CLASSPATH:$JAVA_HOME/lib:$JAVA_HOME/jre/lib' >> /etc/profile

+ 3 - 3
nginx.conf

@@ -17,9 +17,9 @@ http {
     include       mime.types;
     default_type  application/octet-stream;
 
-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-    #                  '$status $body_bytes_sent "$http_referer" '
-    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                     '$status $body_bytes_sent "$http_referer" '
+                     '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log  /data/logs/access.log  main;