Skip to content

Commit

Permalink
Merge pull request #8 from mackerelio/remove-docker-ce
Browse files Browse the repository at this point in the history
remove docker-ce on container.
  • Loading branch information
yseto authored Jun 28, 2022
2 parents 64c2428 + 672560c commit 89bd946
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
10 changes: 1 addition & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,9 @@ RUN apt-get update \
# setup mackerel-agent repo
RUN curl -fsSL https://mackerel.io/file/script/setup-apt-v2.sh | sh

# setup docker repo
# ref: https://docs.docker.com/engine/install/debian/
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
&& echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null

# setup mackerel-agent and docker
# setup mackerel-agent
RUN apt-get update \
&& apt-get install -y mackerel-agent mackerel-agent-plugins mackerel-check-plugins \
&& apt-get install -y docker-ce docker-ce-cli containerd.io \
&& rm -rf /var/lib/apt/lists/*

COPY startup.sh /startup.sh
Expand Down
2 changes: 1 addition & 1 deletion startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fi
if [ "$enable_docker_plugin" != "" ] && [ "$enable_docker_plugin" != "0" ] && ! grep '^\[plugin\.metrics\.docker\]' $conf; then
cat >> $conf << "EOF"
[plugin.metrics.docker]
command = "/usr/bin/mackerel-plugin-docker -method API -name-format name"
command = "/usr/bin/mackerel-plugin-docker -name-format name"
EOF
fi

Expand Down

0 comments on commit 89bd946

Please sign in to comment.