Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47341 )
Change subject: util-docker: Deprecate 18.04-min_dependencies for 20.04-min
......................................................................
util-docker: Deprecate 18.04-min_dependencies for 20.04-min
While we still support Ubuntu 18.04, we will focus testing more-so on
20.04. Therefore, our min-dependency target will now be 20.04 intead of
18.04.
Change-Id: Ib136480e5f9953d216bd5ffc6f0ae3faa1bf2e82
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47341
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
---
M util/cloudbuild/cloudbuild_create_images.yaml
R util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile
2 files changed, 8 insertions(+), 11 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/cloudbuild/cloudbuild_create_images.yaml
b/util/cloudbuild/cloudbuild_create_images.yaml
index b81de98..31876fb 100644
--- a/util/cloudbuild/cloudbuild_create_images.yaml
+++ b/util/cloudbuild/cloudbuild_create_images.yaml
@@ -8,14 +8,14 @@
- name: 'gcr.io/cloud-builders/docker'
args: ['build',
'-t',
- 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest',
- 'util/dockerfiles/ubuntu-18.04_all-dependencies']
+ 'gcr.io/$PROJECT_ID/ubuntu-20.04_min-dependencies:latest',
+ 'util/dockerfiles/ubuntu-20.04_min-dependencies']
- name: 'gcr.io/cloud-builders/docker'
args: ['build',
'-t',
- 'gcr.io/$PROJECT_ID/ubuntu-18.04_min-dependencies:latest',
- 'util/dockerfiles/ubuntu-18.04_min-dependencies']
+ 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest',
+ 'util/dockerfiles/ubuntu-18.04_all-dependencies']
- name: 'gcr.io/cloud-builders/docker'
args: ['build',
@@ -108,8 +108,8 @@
'util/dockerfiles/gcn-gpu']
images: ['gcr.io/$PROJECT_ID/ubuntu-20.04_all-dependencies:latest',
+ 'gcr.io/$PROJECT_ID/ubuntu-20.04_min-dependencies:latest',
'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest',
- 'gcr.io/$PROJECT_ID/ubuntu-18.04_min-dependencies:latest',
'gcr.io/$PROJECT_ID/gcc-version-5:latest',
'gcr.io/$PROJECT_ID/gcc-version-6:latest',
'gcr.io/$PROJECT_ID/gcc-version-7:latest',
diff --git a/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
b/util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile
similarity index 85%
rename from util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
rename to util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile
index 53a7d92..68c61ef 100644
--- a/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile
@@ -24,12 +24,9 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+ENV DEBIAN_FRONTEND=noninteractive
RUN apt -y update
RUN apt -y upgrade
-RUN apt -y install build-essential scons zlib1g-dev m4 python3-dev python3
\
- python3-six
-
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3
10
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python2 1
+RUN apt -y install build-essential m4 scons python3-dev python-is-python3
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47341
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ib136480e5f9953d216bd5ffc6f0ae3faa1bf2e82
Gerrit-Change-Number: 47341
Gerrit-PatchSet: 3
Gerrit-Owner: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
