From 41bab161bb7dc1e235c593906abc8e8b0b2f067f Mon Sep 17 00:00:00 2001
From: d3v-null <dev.null@curtin.edu.au>
Date: Tue, 25 Jun 2024 10:44:17 +0000
Subject: [PATCH] use aoflagger 3.4 and ubuntu 24.04 in docker

---
 Dockerfile    | 9 +++++++--
 Makefile.toml | 6 ++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 581eaf9..6305273 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,9 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
+
+# locale stuff is needed for tzdata
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+    locale-gen
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
 
 ENV DEBIAN_FRONTEND=noninteractive
 ARG DEBUG
@@ -30,7 +35,7 @@ RUN apt-get clean \
 RUN mkdir -m755 /opt/rust /opt/cargo
 ENV RUSTUP_HOME=/opt/rust CARGO_HOME=/opt/cargo PATH=/opt/cargo/bin:$PATH
 # set minimal rust version here to use a newer stable version
-ENV RUST_VERSION=1.67
+ENV RUST_VERSION=stable
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=$RUST_VERSION
 
 # install latest stable rust toolchian, with llvm-tools-preview (for coverage)
diff --git a/Makefile.toml b/Makefile.toml
index aa86ae2..9f3dc0c 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -101,7 +101,7 @@ $SUDO apt-get install -y \
     python3
 cd /tmp
 [ -d "aoflagger" ] && rm -rf aoflagger
-git clone --recurse-submodules https://gitlab.com/aroffringa/aoflagger.git --branch v3.1.0
+git clone --recurse-submodules https://gitlab.com/aroffringa/aoflagger.git --branch v3.4.0
 cd aoflagger
 chmod a+rwx .
 mkdir build
@@ -119,9 +119,7 @@ linux_alias = "linux_install_cfitsio"
 dependencies = ["install_cfitsio"]
 
 [tasks.linux_install_deps]
-dependencies = [
-  "linux_install_aoflagger",
-]
+dependencies = ["linux_install_aoflagger"]
 
 [tasks.install_deps]
 linux_alias = "linux_install_deps"