Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit

Permalink
common: update Ubuntu image to 20.04
Browse files Browse the repository at this point in the history
  • Loading branch information
wlemkows committed Dec 14, 2020
1 parent f88637a commit bdddccb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
10 changes: 5 additions & 5 deletions travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ services:

env:
matrix:
- TYPE=normal OS=ubuntu OS_VER=18.04 TEST_BUILD=Debug COVERAGE=1
- TYPE=normal OS=ubuntu OS_VER=18.04 TEST_BUILD=Debug CC=clang
- TYPE=normal OS=ubuntu OS_VER=18.04 TEST_BUILD=Debug
- TYPE=normal OS=ubuntu OS_VER=18.04 TEST_BUILD=Release CC=clang PUSH_IMAGE=1
- TYPE=normal OS=ubuntu OS_VER=18.04 TEST_BUILD=Release
- TYPE=normal OS=ubuntu OS_VER=20.04 TEST_BUILD=Debug COVERAGE=1
- TYPE=normal OS=ubuntu OS_VER=20.04 TEST_BUILD=Debug CC=clang
- TYPE=normal OS=ubuntu OS_VER=20.04 TEST_BUILD=Debug
- TYPE=normal OS=ubuntu OS_VER=20.04 TEST_BUILD=Release CC=clang PUSH_IMAGE=1
- TYPE=normal OS=ubuntu OS_VER=20.04 TEST_BUILD=Release
- TYPE=normal OS=fedora OS_VER=31 TEST_BUILD=Debug CC=clang
- TYPE=normal OS=fedora OS_VER=31 TEST_BUILD=Debug
- TYPE=normal OS=fedora OS_VER=31 TEST_BUILD=Release CC=clang PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
Expand Down
3 changes: 2 additions & 1 deletion utils/docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2017-2019, Intel Corporation
# Copyright 2017-2020, Intel Corporation

#
# build.sh - runs a Docker container from a Docker image with environment
Expand Down Expand Up @@ -69,6 +69,7 @@ docker run --privileged=true --name=$containerName -ti \
--env TRAVIS_BRANCH=$TRAVIS_BRANCH \
--env TRAVIS_EVENT_TYPE=$TRAVIS_EVENT_TYPE \
--env TEST_BUILD=$TEST_BUILD \
--env TZ='Europe/Warsaw' \
--env CC=$CC \
-v $HOST_WORKDIR:$WORKDIR \
-v /etc/localtime:/etc/localtime \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
#

# Pull base image
FROM ubuntu:18.04
FROM ubuntu:20.04
MAINTAINER [email protected]

ENV DEBIAN_FRONTEND noninteractive

# Update the Apt cache and install basic tools
RUN apt-get update \
&& apt-get install -y software-properties-common \
Expand All @@ -26,6 +28,7 @@ RUN apt-get update \
libtext-diff-perl \
pkg-config \
sudo \
tzdata \
wget \
whois \
libndctl-dev \
Expand All @@ -44,6 +47,6 @@ USER $USER

# Set required environment variables
ENV OS ubuntu
ENV OS_VER 18.04
ENV OS_VER 20.04
ENV PACKAGE_MANAGER deb
ENV NOTTY 1

0 comments on commit bdddccb

Please sign in to comment.