[PATCH] docker: update default to ubuntu 20.04

1 view
Skip to first unread message

Fotis Xenakis

unread,
May 13, 2020, 6:06:09 AM5/13/20
to osv...@googlegroups.com, Fotis Xenakis
Signed-off-by: Fotis Xenakis <fo...@windowslive.com>
---
docker/Dockerfile.builder | 2 +-
docker/Dockerfile.builder-ubuntu-base | 2 +-
docker/Dockerfile.runner-ubuntu | 4 ++--
docker/README.md | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index b53cdf2b..949a5c1a 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -37,7 +37,7 @@ CMD /bin/bash
# docker build -t osv/builder-fedora-31 -f Dockerfile.builder .
#
# Build the container based of specific Ubuntu version
-# docker build -t osv/builder-ubuntu-19.10 -f Dockerfile.builder --build-arg DIST="ubuntu-19.10" .
+# docker build -t osv/builder-ubuntu-20.04 -f Dockerfile.builder --build-arg DIST="ubuntu-20.04" .
#
# Build the container based of specific Fedora version and git repo owner (if forked) example:
# docker build -t osv/builder-fedora-31 -f Dockerfile.builder --build-arg DIST="fedora-31" --build-arg GIT_ORG_OR_USER=a_user .
diff --git a/docker/Dockerfile.builder-ubuntu-base b/docker/Dockerfile.builder-ubuntu-base
index acf0b2a3..db22fc80 100644
--- a/docker/Dockerfile.builder-ubuntu-base
+++ b/docker/Dockerfile.builder-ubuntu-base
@@ -7,7 +7,7 @@
# This Docker file defines an image based on Ubuntu distribution and provides
# all packages necessary to build and run kernel and applications.
#
-ARG DIST_VERSION=19.10
+ARG DIST_VERSION=20.04
FROM ubuntu:${DIST_VERSION}

ENV DEBIAN_FRONTEND noninteractive
diff --git a/docker/Dockerfile.runner-ubuntu b/docker/Dockerfile.runner-ubuntu
index 14641655..e08d5163 100644
--- a/docker/Dockerfile.runner-ubuntu
+++ b/docker/Dockerfile.runner-ubuntu
@@ -8,7 +8,7 @@
# This Docker file defines a container intended to run and test OSv
# It comes with capstan that can pull kernel and pre-built MPM packages
#
-ARG DIST_VERSION=19.10
+ARG DIST_VERSION=20.04
FROM ubuntu:${DIST_VERSION}

ENV DEBIAN_FRONTEND noninteractive
@@ -46,7 +46,7 @@ CMD /bin/bash
# docker build -t osv/runner-ubuntu -f Dockerfile.runner-ubuntu .
#
# Build the container based of specific Ubuntu version and git repo owner (if forked) example:
-# docker build -t osv/runner-ubuntu -f Dockerfile.runner-ubuntu --build-arg DIST_VERSION=19.10 --build-arg GIT_ORG_OR_USER=a_user .
+# docker build -t osv/runner-ubuntu -f Dockerfile.runner-ubuntu --build-arg DIST_VERSION=20.04 --build-arg GIT_ORG_OR_USER=a_user .
#
# Run the container FIRST time example:
# docker run -it --privileged osv/runner-ubuntu
diff --git a/docker/README.md b/docker/README.md
index 1761da45..433707fe 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -9,7 +9,7 @@ docker build -t osv/builder -f Dockerfile.builder .

Build container image for specific version of linux distribution and git repo owner (if forker)
```
-docker build -t osv/builder-ubuntu-19.10 -f Dockerfile.builder --build-arg DIST="ubuntu-19.10" --build-arg GIT_ORG_OR_USER=a_user .
+docker build -t osv/builder-ubuntu-20.04 -f Dockerfile.builder --build-arg DIST="ubuntu-20.04" --build-arg GIT_ORG_OR_USER=a_user .
```

Run container
--
2.26.2

Commit Bot

unread,
May 14, 2020, 9:43:36 PM5/14/20
to osv...@googlegroups.com, Fotis Xenakis
From: Fotis Xenakis <fo...@windowslive.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

docker: update default to ubuntu 20.04

Signed-off-by: Fotis Xenakis <fo...@windowslive.com>
Message-Id: <VI1PR03MB4383C52282...@VI1PR03MB4383.eurprd03.prod.outlook.com>

---
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -37,7 +37,7 @@ CMD /bin/bash
# docker build -t osv/builder-fedora-31 -f Dockerfile.builder .
#
# Build the container based of specific Ubuntu version
-# docker build -t osv/builder-ubuntu-19.10 -f Dockerfile.builder --build-arg DIST="ubuntu-19.10" .
+# docker build -t osv/builder-ubuntu-20.04 -f Dockerfile.builder --build-arg DIST="ubuntu-20.04" .
#
# Build the container based of specific Fedora version and git repo owner (if forked) example:
# docker build -t osv/builder-fedora-31 -f Dockerfile.builder --build-arg DIST="fedora-31" --build-arg GIT_ORG_OR_USER=a_user .
diff --git a/docker/Dockerfile.builder-ubuntu-base b/docker/Dockerfile.builder-ubuntu-base
--- a/docker/Dockerfile.builder-ubuntu-base
+++ b/docker/Dockerfile.builder-ubuntu-base
@@ -7,7 +7,7 @@
# This Docker file defines an image based on Ubuntu distribution and provides
# all packages necessary to build and run kernel and applications.
#
-ARG DIST_VERSION=19.10
+ARG DIST_VERSION=20.04
FROM ubuntu:${DIST_VERSION}

ENV DEBIAN_FRONTEND noninteractive
diff --git a/docker/Dockerfile.runner-ubuntu b/docker/Dockerfile.runner-ubuntu
--- a/docker/Dockerfile.runner-ubuntu
+++ b/docker/Dockerfile.runner-ubuntu
@@ -8,7 +8,7 @@
# This Docker file defines a container intended to run and test OSv
# It comes with capstan that can pull kernel and pre-built MPM packages
#
-ARG DIST_VERSION=19.10
+ARG DIST_VERSION=20.04
FROM ubuntu:${DIST_VERSION}

ENV DEBIAN_FRONTEND noninteractive
@@ -46,7 +46,7 @@ CMD /bin/bash
# docker build -t osv/runner-ubuntu -f Dockerfile.runner-ubuntu .
#
# Build the container based of specific Ubuntu version and git repo owner (if forked) example:
-# docker build -t osv/runner-ubuntu -f Dockerfile.runner-ubuntu --build-arg DIST_VERSION=19.10 --build-arg GIT_ORG_OR_USER=a_user .
+# docker build -t osv/runner-ubuntu -f Dockerfile.runner-ubuntu --build-arg DIST_VERSION=20.04 --build-arg GIT_ORG_OR_USER=a_user .
#
# Run the container FIRST time example:
# docker run -it --privileged osv/runner-ubuntu
diff --git a/docker/README.md b/docker/README.md
Reply all
Reply to author
Forward
0 new messages