Merge branch 'master' into upgrade-to-ubuntu-focal

This commit is contained in:
Travis Rowland authored and GitHub committed 2020-06-04 01:59:29 -07:00
commit 1a389f0456
7 files changed
+111 -59

No files matched your search

-1
View File
@@ -1,6 +1,5 @@
ARG BASE_IMAGE=ubuntu:20.04
FROM $BASE_IMAGE
MAINTAINER Phusion <info@phusion.nl>
ARG QEMU_ARCH
ADD x86_64_qemu-${QEMU_ARCH}-static.tar.gz /usr/bin