From 766a73455e1a2298207c1d8482bc54df275a6fb0 Mon Sep 17 00:00:00 2001 From: Jason Kulatunga Date: Thu, 2 Jun 2022 10:04:36 -0700 Subject: [PATCH] update the base image for docker iamges to ubuntu:latest - which follows the LTS. fixes #274 --- docker/Dockerfile | 4 ++-- docker/Dockerfile.collector | 4 ++-- docker/Dockerfile.web | 2 +- docs/INSTALL_MANUAL.md | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b6cc906..94b6df0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,14 +26,14 @@ RUN npm install -g @angular/cli@9.1.4 && \ ######## -FROM ubuntu:bionic as runtime +FROM ubuntu:latest as runtime ARG TARGETARCH EXPOSE 8080 WORKDIR /opt/scrutiny ENV PATH="/opt/scrutiny/bin:${PATH}" ENV INFLUXD_CONFIG_PATH=/opt/scrutiny/influxdb -RUN apt-get update && apt-get install -y cron smartmontools=7.0-0ubuntu1~ubuntu18.04.1 ca-certificates curl tzdata \ +RUN apt-get update && apt-get install -y cron smartmontools ca-certificates curl tzdata \ && update-ca-certificates \ && case ${TARGETARCH} in \ "amd64") S6_ARCH=amd64 ;; \ diff --git a/docker/Dockerfile.collector b/docker/Dockerfile.collector index 48eccc8..4c1dc8e 100644 --- a/docker/Dockerfile.collector +++ b/docker/Dockerfile.collector @@ -10,11 +10,11 @@ RUN go mod vendor && \ go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go ######## -FROM ubuntu:bionic as runtime +FROM ubuntu:latest as runtime WORKDIR /scrutiny ENV PATH="/opt/scrutiny/bin:${PATH}" -RUN apt-get update && apt-get install -y cron smartmontools=7.0-0ubuntu1~ubuntu18.04.1 ca-certificates tzdata && update-ca-certificates +RUN apt-get update && apt-get install -y cron smartmontools ca-certificates tzdata && update-ca-certificates COPY /docker/entrypoint-collector.sh /entrypoint-collector.sh COPY /rootfs/etc/cron.d/scrutiny /etc/cron.d/scrutiny diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index 7e1e959..2ff577c 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -24,7 +24,7 @@ RUN npm install -g @angular/cli@9.1.4 && \ ######## -FROM ubuntu:bionic as runtime +FROM ubuntu:latest as runtime EXPOSE 8080 WORKDIR /opt/scrutiny ENV PATH="/opt/scrutiny/bin:${PATH}" diff --git a/docs/INSTALL_MANUAL.md b/docs/INSTALL_MANUAL.md index ea4f0c6..1f917d1 100644 --- a/docs/INSTALL_MANUAL.md +++ b/docs/INSTALL_MANUAL.md @@ -113,7 +113,8 @@ Unlike the webapp, the collector does have some dependencies: Unfortunately the version of `smartmontools` (which contains `smartctl`) available in some of the base OS repositories is ancient. So you'll need to install the v7+ version using one of the following commands: -- **Ubuntu:** `apt-get install -y smartmontools=7.0-0ubuntu1~ubuntu18.04.1` +- **Ubuntu (22.04/Jammy/LTS):** `apt-get install -y smartmontools` +- **Ubuntu (18.04/Bionic):** `apt-get install -y smartmontools=7.0-0ubuntu1~ubuntu18.04.1` - **Centos8:** - `dnf install https://extras.getpagespeed.com/release-el8-latest.rpm` - `dnf install smartmontools`