Skip to content

Commit b7be8ff

Browse files
authored
Merge pull request coding#217 from Coding/vangie/add_openssh_and_jdk
修复了 terminal 里 无法 git pull
2 parents c3c7bda + a92de39 commit b7be8ff

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323

2424
before_install:
2525
- sudo apt-get update
26-
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine
26+
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
2727
- nvm install 7
2828
- nvm use 7
2929
- if [ -f ${DOCKER_CACHE_FILE} ]; then gunzip -c ${DOCKER_CACHE_FILE} | docker load; fi

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM java:8-jre-alpine
1+
FROM java:8-jdk-alpine
22

33
EXPOSE 8080
44

55
RUN set -ex && \
66
if [ $(wget -qO- ipinfo.io/country) == CN ]; then echo "http://mirrors.aliyun.com/alpine/latest-stable/main/" > /etc/apk/repositories ;fi && \
77
apk update && \
8-
apk add --no-cache zsh git
8+
apk add --no-cache zsh git openssh
99

1010
# Install oh-my-zsh
1111
RUN git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh \

0 commit comments

Comments
 (0)