1
0
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 20:38:58 +00:00

Compare commits

..

4 Commits

Author SHA1 Message Date
Travis Rowland
5078b027ba Update Makefile
Increment version
2020-06-04 02:23:15 -07:00
Travis Rowland
c2265dfda8 Merge pull request #555 from samip5/upgrade-to-ubuntu-focal
Upgrade to Ubuntu Focal (20.04)
2020-06-04 02:12:24 -07:00
Travis Rowland
1a389f0456 Merge branch 'master' into upgrade-to-ubuntu-focal 2020-06-04 01:59:29 -07:00
Skyler Mäntysaari
a418256b45 Upgraded BASE_IMAGE to 20.04. 2020-05-03 19:00:15 +03:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1,4 +1,4 @@
VERSION ?= bionic-1.0.0
VERSION ?= focal-1.0.0-pre
ifdef BASE_IMAGE
BUILD_ARG = --build-arg BASE_IMAGE=$(BASE_IMAGE)
ifndef NAME

View File

@@ -1,4 +1,4 @@
ARG BASE_IMAGE=ubuntu:18.04
ARG BASE_IMAGE=ubuntu:20.04
FROM $BASE_IMAGE
ARG QEMU_ARCH