From 599b745a9255f18d0d6a148ead1a44737742a8c5 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@collabora.com>
Date: Fri, 4 Dec 2020 10:02:02 +0100
Subject: [PATCH] Pin to a specific version of debos
New debos needs newer fakemachine for the dynamic backends; However that
will also mean a newer slirp-helper etc. So do a quick-fix now to pin it
to the debos versions that has been in use for the past few months while
ensure the new versions don't cause regressions
Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
---
flatdeb-builder/Dockerfile | 3 ++-
image-builder/Dockerfile | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/flatdeb-builder/Dockerfile b/flatdeb-builder/Dockerfile
index 2116cbe..c8e018e 100644
--- a/flatdeb-builder/Dockerfile
+++ b/flatdeb-builder/Dockerfile
@@ -17,7 +17,8 @@ RUN apt-get update && \
libostree-dev && \
rm -rf /var/lib/apt/lists/*
RUN go get -v -d github.com/go-debos/debos/cmd/debos
-RUN git -C ${GOPATH}/src/github.com/go-debos/fakemachine checkout wip/uml && \
+RUN git -C ${GOPATH}/src/github.com/go-debos/debos checkout -b uml d2ab9d3b08056c416bfbcd63c01199e14b2fc3b9 && \
+ git -C ${GOPATH}/src/github.com/go-debos/fakemachine checkout wip/uml && \
go install github.com/go-debos/debos/cmd/debos
# Build the slirp helpers, needed by UML for unprivileged networking
diff --git a/image-builder/Dockerfile b/image-builder/Dockerfile
index a9e5e1e..c01bf87 100644
--- a/image-builder/Dockerfile
+++ b/image-builder/Dockerfile
@@ -17,7 +17,8 @@ RUN apt-get update && \
libostree-dev && \
rm -rf /var/lib/apt/lists/*
RUN go get -v -d github.com/go-debos/debos/cmd/debos
-RUN git -C ${GOPATH}/src/github.com/go-debos/fakemachine checkout wip/uml && \
+RUN git -C ${GOPATH}/src/github.com/go-debos/debos checkout -b uml d2ab9d3b08056c416bfbcd63c01199e14b2fc3b9 && \
+ git -C ${GOPATH}/src/github.com/go-debos/fakemachine checkout wip/uml && \
go install github.com/go-debos/debos/cmd/debos
# Build the slirp helpers, needed by UML for unprivileged networking
--
GitLab