Skip to content

A
apollo
Commit 9a706e13 by Jason Song Committed by GitHub
Options

Merge pull request #774 from nobodyiam/fix-docker-startup-issue

fix no 'ps -p' option available when running with alpine
parents c62f807e aa04fe20
Showing with 26 additions and 27 deletions
apollo-adminservice/src/main/docker/Dockerfile
......@@ -2,17 +2,17 @@
# Build with:
# docker build -t apollo-adminservice .
# Run with:
# docker run -p 8090:8090 -d --name apollo-adminservice apollo-adminservice
# docker run -p 8090:8090 -d -v /tmp/logs:/opt/logs --name apollo-adminservice apollo-adminservice
FROM openjdk:8-jre-alpine
FROM openjdk:8-jre-slim
MAINTAINER ameizi <sxyx2008@163.com>
ENV VERSION 0.8.0
ENV VERSION 0.9.0-SNAPSHOT
RUN echo "http://mirrors.aliyun.com/alpine/v3.6/main" > /etc/apk/repositories \
&& echo "http://mirrors.aliyun.com/alpine/v3.6/community" >> /etc/apk/repositories \
&& apk update upgrade \
&& apk add --no-cache unzip curl bash tzdata \
RUN apt-get update && apt-get install -y --no-install-recommends \
procps \
curl \
&& rm -rf /var/lib/apt/lists/* \
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& echo "Asia/Shanghai" > /etc/timezone
......@@ -25,4 +25,4 @@ RUN unzip /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip -d /apo
EXPOSE 8090
CMD ["/apollo-adminservice/scripts/startup.sh"]
\ No newline at end of file
CMD ["/apollo-adminservice/scripts/startup.sh"]
apollo-configservice/src/main/docker/Dockerfile
......@@ -2,17 +2,17 @@
# Build with:
# docker build -t apollo-configservice .
# Run with:
# docker run -p 8080:8080 -d --name apollo-configservice apollo-configservice
# docker run -p 8080:8080 -d -v /tmp/logs:/opt/logs --name apollo-configservice apollo-configservice
FROM openjdk:8-jre-alpine
FROM openjdk:8-jre-slim
MAINTAINER ameizi <sxyx2008@163.com>
ENV VERSION 0.8.0
ENV VERSION 0.9.0-SNAPSHOT
RUN echo "http://mirrors.aliyun.com/alpine/v3.6/main" > /etc/apk/repositories \
&& echo "http://mirrors.aliyun.com/alpine/v3.6/community" >> /etc/apk/repositories \
&& apk update upgrade \
&& apk add --no-cache unzip curl bash tzdata \
RUN apt-get update && apt-get install -y --no-install-recommends \
procps \
curl \
&& rm -rf /var/lib/apt/lists/* \
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& echo "Asia/Shanghai" > /etc/timezone
......@@ -25,4 +25,4 @@ RUN unzip /apollo-configservice/apollo-configservice-${VERSION}-github.zip -d /a
EXPOSE 8080
CMD ["/apollo-configservice/scripts/startup.sh"]
\ No newline at end of file
CMD ["/apollo-configservice/scripts/startup.sh"]
apollo-portal/src/main/docker/Dockerfile
......@@ -2,17 +2,19 @@
# Build with:
# docker build -t apollo-portal .
# Run with:
# docker run -p 9090:8080 -d --name apollo-portal apollo-portal
# docker run -p 8080:8080 -d -v /tmp/logs:/opt/logs --name apollo-portal apollo-portal
# Or if 8080 was taken:
# docker run -p 8070:8080 -d -v /tmp/logs:/opt/logs --name apollo-portal apollo-portal
FROM openjdk:8-jre-alpine
FROM openjdk:8-jre-slim
MAINTAINER ameizi <sxyx2008@163.com>
ENV VERSION 0.8.0
ENV VERSION 0.9.0-SNAPSHOT
RUN echo "http://mirrors.aliyun.com/alpine/v3.6/main" > /etc/apk/repositories \
&& echo "http://mirrors.aliyun.com/alpine/v3.6/community" >> /etc/apk/repositories \
&& apk update upgrade \
&& apk add --no-cache unzip curl bash tzdata \
RUN apt-get update && apt-get install -y --no-install-recommends \
procps \
curl \
&& rm -rf /var/lib/apt/lists/* \
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& echo "Asia/Shanghai" > /etc/timezone
......@@ -25,4 +27,4 @@ RUN unzip /apollo-portal/apollo-portal-${VERSION}-github.zip -d /apollo-portal \
EXPOSE 8080
CMD ["/apollo-portal/scripts/startup.sh"]
\ No newline at end of file
CMD ["/apollo-portal/scripts/startup.sh"]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment