diff --git a/Dockerfile b/Dockerfile index d99f239..8ed102d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/startup.sh b/startup.sh index ee9f242..a98c092 100644 --- a/startup.sh +++ b/startup.sh @@ -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