Skip to content

Commit

Permalink
docker: update default to ubuntu 20.04
Browse files Browse the repository at this point in the history
Signed-off-by: Fotis Xenakis <[email protected]>
Message-Id: <VI1PR03MB4383C522828428B8D72BCBB3A6BF0@VI1PR03MB4383.eurprd03.prod.outlook.com>
  • Loading branch information
foxeng authored and wkozaczuk committed May 15, 2020
1 parent 4567226 commit 13d2b5f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.builder-ubuntu-base
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.runner-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 13d2b5f

Please sign in to comment.