From 97e2f25d7ffe0a8831290966d3e7747c0325c969 Mon Sep 17 00:00:00 2001
From: Taylor McKinnon <mail@tmacs.space>
Date: Mon, 4 Dec 2023 20:10:00 -0800
Subject: [PATCH] bump flexo, scruffy, and rust versions

---
 images/flexo/Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/images/flexo/Dockerfile b/images/flexo/Dockerfile
index cde08f8..8514ba6 100644
--- a/images/flexo/Dockerfile
+++ b/images/flexo/Dockerfile
@@ -1,18 +1,20 @@
-ARG FLEXO_VERSION=1.6.6
+ARG FLEXO_VERSION=1.6.9
+ARG SCRUFFY_VERSION=0.2.0
 
 # A separate stage is used only for fetching the dependencies:
 # This is done so that we can use cargo's --offline mode in a subsequent stage,
 # as a workaround for this bug: https://github.com/docker/buildx/issues/395
-FROM --platform=linux/amd64 rust:1.52.1-buster as fetch
+FROM --platform=linux/amd64 rust:1.64.0-buster as fetch
 
 ARG FLEXO_VERSION
+ARG SCRUFFY_VERSION
 
 WORKDIR /tmp
 
 RUN mkdir /tmp/flexo_sources
 
 RUN wget -q https://github.com/nroi/flexo/archive/$FLEXO_VERSION.tar.gz -O flexo.tar.gz && \
-    wget -q https://github.com/nroi/scruffy/archive/0.1.0.tar.gz -O scruffy.tar.gz && \
+    wget -q https://github.com/nroi/scruffy/archive/$SCRUFFY_VERSION.tar.gz -O scruffy.tar.gz && \
     tar xf flexo.tar.gz && \
     tar xf scruffy.tar.gz
 
@@ -22,12 +24,12 @@ RUN cd /tmp/flexo-$FLEXO_VERSION/flexo && \
     cp -r flexo /tmp/flexo_sources/ && \
     cp /tmp/flexo-$FLEXO_VERSION/flexo_purge_cache /tmp/flexo_purge_cache
 
-RUN cd '/tmp/scruffy-0.1.0' && \
+RUN cd /tmp/scruffy-$SCRUFFY_VERSION && \
     cargo vendor && \
     cd .. && \
-    cp -r 'scruffy-0.1.0' /tmp/scruffy_sources
+    cp -r scruffy-$SCRUFFY_VERSION /tmp/scruffy_sources
 
-FROM rust:1.52.1-buster as build
+FROM rust:1.64.0-buster as build
 
 COPY --from=fetch /tmp/flexo_sources/ /tmp/flexo_sources
 COPY --from=fetch /tmp/scruffy_sources/ /tmp/scruffy_sources