1. 29 6月, 2019 1 次提交
  2. 22 6月, 2019 1 次提交
  3. 20 6月, 2019 3 次提交
  4. 19 6月, 2019 1 次提交
  5. 18 6月, 2019 1 次提交
    • catoop's avatar
      support passing database, meta server info via system environment · 3bfed3c8
      catoop 提交于
      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
  6. 15 6月, 2019 2 次提交
    • J
      add known user · b84f5b3f
      Jason Song 提交于
      b84f5b3f
    • catoop's avatar
      support setting server port from enviroment variables · 46ed5271
      catoop 提交于
      1.将服务端口提取到docker run的 -e SERVER_PORT 可指定,在docker需要使用host网络时,可以不用修改代码指定端口,避免与宿主机上的原有端口占用冲突 (#2333)
      
      2.对docker CMD入口的startup.sh文件,增加可执行授权指令,防止在某些时候该文件被打包进入后没有执行权限的麻烦(已实际遇到,又回头重新打包)
      46ed5271
  7. 11 6月, 2019 1 次提交
  8. 09 6月, 2019 2 次提交
  9. 08 6月, 2019 1 次提交
  10. 07 6月, 2019 4 次提交
  11. 03 6月, 2019 1 次提交
  12. 01 6月, 2019 1 次提交
  13. 28 5月, 2019 1 次提交
  14. 25 5月, 2019 2 次提交
  15. 23 5月, 2019 1 次提交
  16. 21 5月, 2019 2 次提交
  17. 18 5月, 2019 2 次提交
  18. 16 5月, 2019 1 次提交
  19. 12 5月, 2019 1 次提交
  20. 10 5月, 2019 1 次提交
  21. 03 5月, 2019 1 次提交
  22. 02 5月, 2019 1 次提交
  23. 01 5月, 2019 3 次提交
  24. 27 4月, 2019 3 次提交
    • J
      add known users · 4f6221c5
      Jason Song 提交于
      4f6221c5
    • J
      Fixes #2162 · b8a7eada
      Jason Song 提交于
      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
    • J
      fix #2167 (#2172) · 05a3229e
      Jason Song 提交于
      05a3229e
  25. 23 4月, 2019 1 次提交
  26. 21 4月, 2019 1 次提交