Commit d8958870 authored by caiyanming's avatar caiyanming

remove docker-ce from Dockerfile

Change-Id: Id035e9307b50856f40be7fde5e186fed3716af0d
parent 36590acb
...@@ -21,14 +21,7 @@ COPY sources.list /etc/apt/sources.list ...@@ -21,14 +21,7 @@ COPY sources.list /etc/apt/sources.list
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y git curl \ && apt-get install -y git curl \
&& apt-get install sudo -y --allow-unauthenticated \ && rm -rf /var/lib/apt/lists/*
&& apt-get -y install apt-transport-https ca-certificates software-properties-common \
&& curl -fsSL http://mirrors.aliyun.com/docker-ce/linux/ubuntu/gpg | apt-key add - \
&& add-apt-repository "deb [arch=amd64] http://mirrors.aliyun.com/docker-ce/linux/ubuntu $(lsb_release -cs) stable" \
&& apt-get -y update \
&& apt-get -y install docker-ce \
&& rm -rf /var/lib/apt/lists/* \
&& echo "jenkins ALL=NOPASSWD: ALL" >> /etc/sudoers
ARG user=jenkins ARG user=jenkins
ARG group=jenkins ARG group=jenkins
...@@ -44,8 +37,7 @@ ENV JENKINS_SLAVE_AGENT_PORT ${agent_port} ...@@ -44,8 +37,7 @@ ENV JENKINS_SLAVE_AGENT_PORT ${agent_port}
# If you bind mount a volume from the host or a data container, # If you bind mount a volume from the host or a data container,
# ensure you use the same uid # ensure you use the same uid
RUN groupadd -g ${gid} ${group} \ RUN groupadd -g ${gid} ${group} \
&& useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user} \ && useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user}
&& usermod -aG docker ${user}
# Jenkins home directory is a volume, so configuration and build history # Jenkins home directory is a volume, so configuration and build history
# can be persisted and survive image upgrades # can be persisted and survive image upgrades
......
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