From 0d41005c4c8888eb4a696caa11b54b712177234f Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Wed, 27 Aug 2025 20:01:51 +0200 Subject: [PATCH 1/2] Update comments in Dockerfiles Signed-off-by: Thomas Lauf --- test/docker/task.dockerfile | 4 ++-- test/docker/timew.dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/docker/task.dockerfile b/test/docker/task.dockerfile index d858790..ef7fa68 100644 --- a/test/docker/task.dockerfile +++ b/test/docker/task.dockerfile @@ -53,12 +53,12 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && \ # Checkout Taskwarrior WORKDIR /root -# clone repo with submodels as we need corrosion +# clone repo with all submodules, as we need 'corrosion' RUN git clone --recurse-submodules https://github.com/GothenburgBitFactory/taskwarrior.git code WORKDIR code RUN git checkout ${BRANCH} -# remove libshared folder which is the submodel +# remove libshared submodule folder RUN rm -rf src/libshared FROM base AS builder diff --git a/test/docker/timew.dockerfile b/test/docker/timew.dockerfile index e0bd5f6..d781617 100644 --- a/test/docker/timew.dockerfile +++ b/test/docker/timew.dockerfile @@ -47,7 +47,7 @@ ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 -# Checkout Timewarrior +# Checkout Timewarrior (without libshared submodule) WORKDIR /root RUN git clone https://github.com/GothenburgBitFactory/timewarrior.git code WORKDIR code From eded15f34b43d2683839812508f0980eaf0e0e73 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Wed, 27 Aug 2025 21:50:48 +0200 Subject: [PATCH 2/2] Fix legacy key value format in Dockerfiles Signed-off-by: Thomas Lauf --- test/docker/task.dockerfile | 8 ++++---- test/docker/timew.dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/docker/task.dockerfile b/test/docker/task.dockerfile index ef7fa68..dee9603 100644 --- a/test/docker/task.dockerfile +++ b/test/docker/task.dockerfile @@ -28,7 +28,7 @@ ARG BRANCH FROM ubuntu:24.04 AS base -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y \ @@ -43,9 +43,9 @@ RUN apt-get update && \ uuid-dev # Setup language environment -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 +ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 # Setup Rust RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && \ diff --git a/test/docker/timew.dockerfile b/test/docker/timew.dockerfile index d781617..185db3e 100644 --- a/test/docker/timew.dockerfile +++ b/test/docker/timew.dockerfile @@ -28,7 +28,7 @@ ARG BRANCH FROM ubuntu:24.04 AS base -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN ( apt-get update && yes | unminimize ) && \ apt-get install -y \ @@ -43,9 +43,9 @@ RUN ( apt-get update && yes | unminimize ) && \ tzdata # Setup language environment -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 +ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 # Checkout Timewarrior (without libshared submodule) WORKDIR /root