Merge pull request #27 from movabletype/improve-mt-watcher

Refactored Dockerfile for mt-watcher.

Author: usualoma

CHANGELOG.md

@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Introduce UPDATE_DOCKER_IMAGE environment variable.
     * Setting this environment variable to "no" will skip updating the Docker image during `make up`.
 
+### Changed
+
+* Refactored Dockerfile for mt-watcher.
+    * Ensure that binaries with the appropriate architecture are installed even if BuildKit is disabled.
+    * Reduced image size by using "perl:*-slim" images.
+
 ## [2.2.0] - 2023-02-15
 
 ### Added

mt/mt-watcher/Dockerfile

@@ -1,20 +1,20 @@
-FROM perl:5.36
+FROM perl:5.36-slim
 
-ARG TARGETARCH
 ARG DOCKER_VERSION=20.10.9
 
-## docker
 RUN set -ex \
     \
+    && apt-get update \
+    && apt-get install -y curl gcc \
+    && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* \
+    ## docker
     && mkdir /tmp/docker \
     && cd /tmp/docker \
-    && case "${TARGETARCH}" in arm64) platform=aarch64;; *) platform=x86_64;; esac \
-    && curl -sL https://download.docker.com/linux/static/stable/${platform}/docker-${DOCKER_VERSION}.tgz -o docker.tgz \
+    && curl -sL https://download.docker.com/linux/static/stable/`arch`/docker-${DOCKER_VERSION}.tgz -o docker.tgz \
     && tar zxf docker.tgz \
     && mv docker/docker /usr/bin/docker \
-    && rm -fr /tmp/docker
-
-## cpan libraries
-RUN set -ex \
-  \
-  && cpanm Filesys::Notify::Simple Linux::Inotify2
+    && rm -fr /tmp/docker \
+    && cd \
+    ## cpan libraries
+    && cpanm Filesys::Notify::Simple Linux::Inotify2 \
+    && apt-get purge -y curl gcc