diff --git a/Dockerfile b/Dockerfile index f0310a62edaa70b25c50552a3b7255437e4a2b49..ffdbdb4feb221d492d1357f1aac36e7abd15b0a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,4 @@ -# -# 优化精简镜像体积,比之前的小一半 -# -FROM registry.cn-hangzhou.aliyuncs.com/devops_hu/maven:3.5.2 as build +FROM registry.cn-hangzhou.aliyuncs.com/devops_hu/maven:3.8.3-ibmjava-alpine ARG USER_HOME_DIR="/root" @@ -14,30 +11,6 @@ RUN chmod 755 ${USER_HOME_DIR}/bin/*.sh \ && mvn install \ && rm -rf /tmp/* /var/cache/apk/* - -## 使用官方最精简jre镜像 -FROM amd64/openjdk:11-jre-slim - -maintainer 红薯 \ - name="kooder" \ - version="1.0.beta4" \ - description="Kooder is an open source code search project" \ - homepage="https://gitee.com/koode/kooder.git" - -## 将应用发布到opt下,将部署路径修改为/opt/kooder, -ARG USER_HOME_DIR="/opt/kooder" - -WORKDIR ${USER_HOME_DIR} - -RUN mkdir -p ${USER_HOME_DIR} -## 只将有用的文件复制过来 -COPY --from=build /root/bin ${USER_HOME_DIR}/bin -COPY --from=build /root/lib ${USER_HOME_DIR}/lib -COPY --from=build /root/kooder.properties ${USER_HOME_DIR}/kooder.properties -COPY --from=build /root/gateway/target/classes ${USER_HOME_DIR}/gateway/target/classes -## 启动文件修改一下路径地址,不影响原代码 -RUN sed -i 's/root/opt\/kooder/g' ${USER_HOME_DIR}/bin/gatewaydocker.sh - EXPOSE 8080 -CMD ["/opt/kooder/bin/gatewaydocker.sh"] +CMD ["/root/bin/gatewaydocker.sh"] diff --git a/docker-compose-ha.yaml b/docker-compose-ha.yaml index f0d31e020862e81676b6b98011efb974adb478bd..97939aa8a636f619adf30abcf565bf8fd002b015 100644 --- a/docker-compose-ha.yaml +++ b/docker-compose-ha.yaml @@ -2,7 +2,7 @@ version: '3.8' services: koodera: - image: registry.cn-hangzhou.aliyuncs.com/devops_hu/kooder:v1.0.1 + image: registry.cn-hangzhou.aliyuncs.com/devops_hu/kooder:v1.1.0 expose: - 8080 kooderb: @@ -13,7 +13,7 @@ services: haproxy: image: haproxy:1.6 volumes: - - ./kooder.properties:/opt/kooder/kooder.properties:ro + - ./kooder.properties:/root/kooder.properties:ro - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro links: - koodera @@ -21,5 +21,3 @@ services: ports: - "8080:8080" - - diff --git a/docker-compose.yaml b/docker-compose.yaml index dd3c824279a2a70c837f973ae5ff15e705ac8bad..79c7b8e08fafa7de27c790206be39a14ce4f1a7b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,6 +5,6 @@ services: image: registry.cn-hangzhou.aliyuncs.com/devops_hu/kooder:v1.0.1 container_name: kooder volumes: - - ./kooder.properties:/opt/kooder/kooder.properties:ro + - ./kooder.properties:/root/kooder.properties:ro ports: - 8080:8080