From 2cb8ec2fb29d2c1812cf7458d5747c8f4575a9c1 Mon Sep 17 00:00:00 2001 From: Blake Harnden <32446120+bharnden@users.noreply.github.com> Date: Tue, 25 Jul 2023 16:00:59 -0700 Subject: [PATCH] install: updates to centos dockerfiles --- dockerfiles/Dockerfile.centos | 6 ++++-- dockerfiles/Dockerfile.centos-package | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dockerfiles/Dockerfile.centos b/dockerfiles/Dockerfile.centos index 6a33039c..06654486 100644 --- a/dockerfiles/Dockerfile.centos +++ b/dockerfiles/Dockerfile.centos @@ -13,6 +13,7 @@ WORKDIR /opt # install system dependencies RUN yum -y update && \ yum install -y \ + xterm \ git \ sudo \ wget \ @@ -27,7 +28,8 @@ RUN yum -y update && \ tcpdump \ make && \ yum-builddep -y python3 && \ - yum autoremove -y + yum autoremove -y && \ + yum install -y hostname # install python3.9 RUN wget https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tgz && \ @@ -44,7 +46,7 @@ RUN git clone https://github.com/coreemu/core && \ cd core && \ git checkout ${BRANCH} && \ NO_SYSTEM=1 PYTHON=/usr/local/bin/python3.9 ./setup.sh && \ - . /root/.bashrc && PYTHON=/usr/local/bin/python3.9 inv install -v -p ${PREFIX} --no-python + PATH=/root/.local/bin:$PATH PYTHON=/usr/local/bin/python3.9 inv install -v -p ${PREFIX} --no-python # install emane RUN wget -q https://adjacentlink.com/downloads/emane/emane-1.3.3-release-1.el7.x86_64.tar.gz && \ diff --git a/dockerfiles/Dockerfile.centos-package b/dockerfiles/Dockerfile.centos-package index 5c2366ed..8d4a1296 100644 --- a/dockerfiles/Dockerfile.centos-package +++ b/dockerfiles/Dockerfile.centos-package @@ -11,6 +11,7 @@ WORKDIR /opt # install basic dependencies RUN yum -y update && \ yum install -y \ + xterm \ git \ sudo \ wget \ @@ -30,7 +31,8 @@ RUN yum -y update && \ pkg-config \ make && \ yum-builddep -y python3 && \ - yum autoremove -y + yum autoremove -y && \ + yum install -y hostname # install python3.9 RUN wget https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tgz && \