removed skywalking

siegrainwong · Jul 26, 2019 · 4caf167 · 4caf167
1 parent dbf3ea3
commit 4caf167
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 59 deletions.
diff --git a/build/docker-compose.dev.yml b/build/docker-compose.dev.yml
@@ -42,9 +42,9 @@ services:
    #     SKYWALKING__SERVICENAME: ancorazor
    # 
 
-  skywalking-ui:
-    ports:
-      - 8080:8080
+  #skywalking-ui:
+  #  ports:
+  #    - 8080:8080
   portainer:
     ports:
       - 9000:9000
diff --git a/build/docker-compose.prod.yml b/build/docker-compose.prod.yml
@@ -22,16 +22,16 @@ services:
   mssql:
     environment:
       SA_PASSWORD: #{MSSQL_SA_PASSWORD}#
-  skywalking-ui:
-    environment:
-      VIRTUAL_HOST: apm.siegrain.wang
-      VIRTUAL_PORT: 8080
-      LETSENCRYPT_HOST: apm.siegrain.wang
-      # worked but admin still loginable
-      security.user.#{SW_USERNAME}#.password: #{SW_PASSWORD}#
-    volumes:
-      # not work 
-      - ./skywalking-ui-config/webapp.prod.yml:/apache-skywalking-apm-bin/webapp/webapp.yml:ro
+  #skywalking-ui:
+  #  environment:
+  #    VIRTUAL_HOST: apm.siegrain.wang
+  #    VIRTUAL_PORT: 8080
+  #    LETSENCRYPT_HOST: apm.siegrain.wang
+  #    # worked but admin still loginable
+  #    security.user.#{SW_USERNAME}#.password: #{SW_PASSWORD}#
+  #  volumes:
+  #    # not work 
+  #    - ./skywalking-ui-config/webapp.prod.yml:/apache-skywalking-apm-bin/webapp/webapp.yml:ro
   ancorazor:
     image: siegrainwong/ancorazor:#{Build.BuildNumber}#
     environment:

diff --git a/build/docker-compose.yml b/build/docker-compose.yml
@@ -16,47 +16,47 @@
 
 version: '3.3'
 services:
-  elasticsearch:
-    image: wutang/elasticsearch-shanghai-zone:6.3.2
-    container_name: elasticsearch
-    restart: always
-    ports:
-      - 9300
-    environment:
-      discovery.type: single-node
-      ES_JAVA_OPTS: "-Xmx256m -Xms256m"
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-    volumes:
-      - elasticsearch://usr/share/elasticsearch/data
-  skywalking-oap:
-    image: siegrainwong/skywalking-oap:6.1.0
-    container_name: skywalking-oap
-    depends_on:
-      - elasticsearch
-    links:
-      - elasticsearch
-    restart: always
-    ports:
-      - 11800
-      - 12800
-    environment:
-      SW_STORAGE: elasticsearch
-      SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
-  skywalking-ui:
-    image: apache/skywalking-ui:6.1.0
-    container_name: skywalking-ui
-    depends_on:
-      - skywalking-oap
-    links:
-      - skywalking-oap
-    ports:
-      - 8080
-    restart: always
-    environment:
-      SW_OAP_ADDRESS: skywalking-oap:12800
+  #elasticsearch:
+  #  image: wutang/elasticsearch-shanghai-zone:6.3.2
+  #  container_name: elasticsearch
+  #  restart: always
+  #  ports:
+  #    - 9300
+  #  environment:
+  #    discovery.type: single-node
+  #    ES_JAVA_OPTS: "-Xmx256m -Xms256m"
+  #  ulimits:
+  #    memlock:
+  #      soft: -1
+  #      hard: -1
+  #  volumes:
+  #    - elasticsearch://usr/share/elasticsearch/data
+  #skywalking-oap:
+  #  image: siegrainwong/skywalking-oap:6.1.0
+  #  container_name: skywalking-oap
+  #  depends_on:
+  #    - elasticsearch
+  #  links:
+  #    - elasticsearch
+  #  restart: always
+  #  ports:
+  #    - 11800
+  #    - 12800
+  #  environment:
+  #    SW_STORAGE: elasticsearch
+  #    SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
+  #skywalking-ui:
+  #  image: apache/skywalking-ui:6.1.0
+  #  container_name: skywalking-ui
+  #  depends_on:
+  #    - skywalking-oap
+  #  links:
+  #    - skywalking-oap
+  #  ports:
+  #    - 8080
+  #  restart: always
+  #  environment:
+  #    SW_OAP_ADDRESS: skywalking-oap:12800
   mssql:
     image: mcr.microsoft.com/mssql/server:2017-latest
     container_name: mssql
@@ -80,5 +80,5 @@ services:
       - portainer_data:/data
 volumes:
   ancorazor:
-  elasticsearch:
+  #elasticsearch:
   portainer_data:
diff --git a/build/release-script.sh b/build/release-script.sh
@@ -5,9 +5,5 @@ cd ~/ancorazor/build
 docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d 2> docker-compose.log
 cat docker-compose.log
 
-# this command would failed if there's no images to remove, so redirect this too.
-docker rmi $(docker images -a siegrainwong/ancorazor -f "before=siegrainwong/ancorazor:20190628.6" -q 2> /dev/null) 2> remove-unused-images.log
-cat remove-unused-images.log
-
 # warm up
 curl https://siegrain.wang -o warm-up.log