root 3 years ago
parent
commit
2aa6c85534
10 changed files with 43 additions and 16 deletions
  1. 4 4
      .drone.yml
  2. 1 1
      .gitignore
  3. 1 1
      Dockerfile
  4. 7 7
      Dockerfile.v1
  5. 1 1
      README.md
  6. 2 1
      ad_easou.ini
  7. BIN
      ad_easou.tgz
  8. BIN
      asp.tgz
  9. 1 1
      deploy-tmp.yaml
  10. 26 0
      epel.repo

+ 4 - 4
.drone.yml

@@ -1,6 +1,6 @@
 kind: pipeline
 type: kubernetes
-name: asp
+name: ad_easou
 
 clone:
   disable: true
@@ -23,7 +23,7 @@ steps:
      mirror: https://ci7pm4nx.mirror.aliyuncs.com
      registry: hub.evbj.easou.com
      repo: hub.evbj.easou.com/oldad/${DRONE_REPO_NAME}
-     tag: v1.0.1
+     tag: v1.0.0
      
  - name: deployment
    image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
@@ -32,11 +32,11 @@ steps:
    environment:
      JNLP_ENV: oldad
      JNLP_REPLICAS: 1
-     JNLP_TAG: v1.0.1
+     JNLP_TAG: v1.0.0
      JNLP_VERSION: v1  # default v1, v2 for canary
      DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群:k8s-1 or k8s-2
      JNLP_REPO: hub.evbj.easou.com
-     JNLP_CONTAINER_PORT: 8803
+     JNLP_CONTAINER_PORT: 9009
      JNLP_INGRESS: nginx
      JNLP_SVC_MODE: http
      JNLP_STORAGE_CLASS: rbd

+ 1 - 1
.gitignore

@@ -1 +1 @@
-asp/
+ad_easou/

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/oldad/asp:v1.0.0
+FROM hub.evbj.easou.com/oldad/ad_easou:v1.0.0

+ 7 - 7
Dockerfile.v1

@@ -2,12 +2,12 @@ FROM hub.evbj.easou.com/dev/centos:7.9.2009
 
 ENV TZ=Asia/Shanghai
 
-COPY asp.tgz /tmp/asp.tgz
+COPY ad_easou.tgz /tmp/ad_easou.tgz
+COPY epel.repo /etc/yum.repos.d/epel.repo
 
-RUN rm -f /etc/yum.repos.d/* \
+RUN rm -f /etc/yum.repos.d/CentOS-* \
     && curl -s http://mirrors.163.com/.help/CentOS7-Base-163.repo -o /etc/yum.repos.d/CentOS7-Base-163.repo \
     && yum clean all \
-    && yum install epel-release -y \
     && yum install -y supervisor libcrypto.so.6 libldap-2.3.so.0 liblber-2.3.so.0 \
     && ln -s /usr/lib64/libcrypto.so.1.0.2k /usr/lib64/libcrypto.so.6 \
     && ln -s /usr/lib64/liblber-2.4.so.2.10.7 /usr/lib64/liblber-2.3.so.0 \
@@ -15,12 +15,12 @@ RUN rm -f /etc/yum.repos.d/* \
     && ln -s /usr/lib64/libssl.so.1.0.2k /usr/lib64/libssl.so.6 \
     && sed -i "s/nodaemon=false/nodaemon=true/" /etc/supervisord.conf \
     && useradd ecom \
-    && mkdir -p /app/ecom /data/ecom/asp/logs \
-    && tar -zxf /tmp/asp.tgz -C /app/ecom/ \
+    && mkdir -p /app/ecom /data/ecom/ad_easou/logs \
+    && tar -zxf /tmp/ad_easou.tgz -C /app/ecom/ \
     && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
-    && chown -R ecom:ecom /app/ecom /data/ecom/asp/logs
+    && chown -R ecom:ecom /app/ecom /data/ecom/ad_easou/logs
 
-COPY asp.ini /etc/supervisord.d/asp.ini
+COPY ad_easou.ini /etc/supervisord.d/ad_easou.ini
 
 
 CMD ["supervisord"]

+ 1 - 1
README.md

@@ -1,4 +1,4 @@
-# asp
+# ad_easou
 * 10.26.28.39
 
 

+ 2 - 1
asp.ini → ad_easou.ini

@@ -1,5 +1,6 @@
 [program:ds]
-command=/app/ecom/asp/aspctl.sh start
+directory=/app/ecom/ad_easou
+command=/app/ecom/ad_easou/ad_easou_ctl.sh start
 process_name=%(program_name)s
 startsecs=30
 startretries=3

BIN
ad_easou.tgz


BIN
asp.tgz


+ 1 - 1
deploy-tmp.yaml

@@ -27,7 +27,7 @@ spec:
             mountPath: $JNLP_MOUNT_PATH
         - name: mkdir
           image: $JNLP_REPO/dev/busybox
-          command: ["mkdir","-p","/data/ecom/asp/logs"]
+          command: ["mkdir","-p","/data/ecom/ad_easou/logs"]
           volumeMounts:
           - name: volume
             mountPath: $JNLP_MOUNT_PATH

+ 26 - 0
epel.repo

@@ -0,0 +1,26 @@
+[epel]
+name=Extra Packages for Enterprise Linux 7 - $basearch
+baseurl=https://mirrors.tuna.tsinghua.edu.cn/epel/7/$basearch
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
+failovermethod=priority
+enabled=1
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+
+[epel-debuginfo]
+name=Extra Packages for Enterprise Linux 7 - $basearch - Debug
+baseurl=https://mirrors.tuna.tsinghua.edu.cn/epel/7/$basearch/debug
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch
+failovermethod=priority
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+gpgcheck=1
+
+[epel-source]
+name=Extra Packages for Enterprise Linux 7 - $basearch - Source
+baseurl=https://mirrors.tuna.tsinghua.edu.cn/epel/7/SRPMS
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch
+failovermethod=priority
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+gpgcheck=1