summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorAndrej Shadura <andrew.shadura@collabora.co.uk>2020-10-14 22:18:30 +0200
committerAndrej Shadura <andrew.shadura@collabora.co.uk>2020-10-14 22:18:30 +0200
commit9c6de646795022f856ed7c22d28e2d63e4c0ca22 (patch)
tree28e847152eafec18f74708ee4601e0b9aac1e02e /docker
parentfef5746ee329eb560d740132895ed29a44e44d10 (diff)
New upstream version 1.0.0+git20200909.d2ab9d3
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile13
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 252c295..c393617 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,12 +20,16 @@ RUN apt-get update && \
libostree-dev && \
rm -rf /var/lib/apt/lists/*
+# Build testify from source
+# testify v1.3.0 is the last version to work with golang v1.11
+WORKDIR $GOPATH/src/github.com/stretchr/testify
+RUN git clone --depth 1 --branch v1.3.0 https://github.com/stretchr/testify . && \
+ GO111MODULE=on go get ./...
+
# Build debos
COPY . $GOPATH/src/github.com/go-debos/debos
WORKDIR $GOPATH/src/github.com/go-debos/debos/cmd/debos
-RUN go get -d ./... && \
- go get -d github.com/stretchr/testify && \
- go install
+RUN go get -t ./...
### second stage - runner ###
FROM debian:buster-slim as runner
@@ -63,6 +67,8 @@ RUN apt-get update && \
debootstrap \
dosfstools \
e2fsprogs \
+ fdisk \
+ f2fs-tools \
gzip \
pigz \
libostree-1-1 \
@@ -73,6 +79,7 @@ RUN apt-get update && \
qemu-user-static \
systemd \
systemd-container \
+ u-boot-tools \
unzip \
xz-utils && \
rm -rf /var/lib/apt/lists/*