1. 13 Jul, 2019 1 commit
  2. 07 Jul, 2019 2 commits
  3. 29 Jun, 2019 1 commit
  4. 22 Jun, 2019 1 commit
  5. 20 Jun, 2019 3 commits
  6. 19 Jun, 2019 1 commit
  7. 18 Jun, 2019 1 commit
    • xzxiaoshan's avatar
      support passing database, meta server info via system environment · 3bfed3c8
      xzxiaoshan authored
      docker-compose.yml sample:
      ------------------------------------------------------------------------------------------
      version: '3'
      services:
        apollo-portal:
          image: docker.io/xzxiaoshan/apollo-portal:1.4.0
          container_name: apollo-portal
          network_mode: "host"
          environment:
            SERVER_PORT: 5555
            # DataSource Info
            DS_URL: "jdbc:mysql://pro.shanhy.com:3306/ApolloPortalDB?characterEncoding=utf8"
            DS_USERNAME: "shanhy"
            DS_PASSWORD: "xzxiaoshan@123"
            # Environmental variable declaration (meta server url, different environments should have different meta server addresses)
            DEV_META: "http://dev.shanhy.com:6666"
            FAT_META: ""
            UAT_META: ""
            LPT_META: ""
            PRO_META: "http://pro.shanhy.com:6666"
          depends_on:
            - apollo-adminservice
          logging:
            driver: "json-file"
            options:
              max-size: "200k"
              max-file: "10"
      
        apollo-configservice:
          image: docker.io/xzxiaoshan/apollo-configservice:1.4.0
          container_name: apollo-configservice
          network_mode: "host"
          environment:
            SERVER_PORT: 6666
            # DataSource Info
            DS_URL: "jdbc:mysql://pro.shanhy.com:3306/ApolloPortalDB?characterEncoding=utf8"
            DS_USERNAME: "shanhy"
            DS_PASSWORD: "xzxiaoshan@123"
          logging:
            driver: "json-file"
            options:
              max-size: "200k"
              max-file: "10"
      
        apollo-adminservice:
          image: docker.io/xzxiaoshan/apollo-adminservice:1.4.0
          container_name: apollo-adminservice
          network_mode: "host"
          environment:
            SERVER_PORT: 6667
            # DataSource Info
            DS_URL: "jdbc:mysql://pro.shanhy.com:3306/ApolloPortalDB?characterEncoding=utf8"
            DS_USERNAME: "shanhy"
            DS_PASSWORD: "xzxiaoshan@123"
          depends_on:
            - apollo-configservice
          logging:
            driver: "json-file"
            options:
              max-size: "200k"
              max-file: "10"
      3bfed3c8
  8. 15 Jun, 2019 2 commits
    • Jason Song's avatar
      add known user · b84f5b3f
      Jason Song authored
      b84f5b3f
    • xzxiaoshan's avatar
      support setting server port from enviroment variables · 46ed5271
      xzxiaoshan authored
      1.将服务端口提取到docker run的 -e SERVER_PORT 可指定,在docker需要使用host网络时,可以不用修改代码指定端口,避免与宿主机上的原有端口占用冲突 (#2333)
      
      2.对docker CMD入口的startup.sh文件,增加可执行授权指令,防止在某些时候该文件被打包进入后没有执行权限的麻烦(已实际遇到,又回头重新打包)
      46ed5271
  9. 11 Jun, 2019 1 commit
  10. 09 Jun, 2019 2 commits
  11. 08 Jun, 2019 1 commit
  12. 07 Jun, 2019 4 commits
  13. 03 Jun, 2019 1 commit
  14. 01 Jun, 2019 1 commit
  15. 28 May, 2019 1 commit
  16. 25 May, 2019 2 commits
  17. 23 May, 2019 1 commit
  18. 21 May, 2019 2 commits
  19. 18 May, 2019 2 commits
  20. 16 May, 2019 1 commit
  21. 12 May, 2019 1 commit
  22. 10 May, 2019 1 commit
  23. 03 May, 2019 1 commit
  24. 02 May, 2019 1 commit
  25. 01 May, 2019 3 commits
  26. 27 Apr, 2019 2 commits
    • Jason Song's avatar
      add known users · 4f6221c5
      Jason Song authored
      4f6221c5
    • Jason Song's avatar
      Fixes #2162 · b8a7eada
      Jason Song authored
      For cases like #2162, there are other property source wrappers like jasypt, so we won't be able to decide whether to trigger this change or not.
      So it's better just to trigger it as it is idempotent.
      b8a7eada