From ab56cc6d4a8fdaf9282714813f65f0291082e693 Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@yahoo.com>
Date: Mon, 13 May 2024 23:57:33 -0700
Subject: [PATCH] minor update

---
 .travis.yml                    |  4 ++--
 miscs/docker/Dockerfile.ubuntu | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 332b2c482..ca817b562 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ before_install:
   - if [ ! -d "$TOOLDIR" ] || [ -z "$(ls -A $TOOLDIR)" ] || [ "$(cat "$TOOLDIR/version.txt")" != "v0.3" ]; then
       rm -rf $TOOLDIR;
       mkdir -p $TRAVIS_BUILD_DIR/build && cd $TRAVIS_BUILD_DIR/build;
-      TOOLDIR=$TOOLDIR ../configure;
+      ../configure --tooldir=$TOOLDIR;
       ci/toolchain_install.sh --all;
       echo "v0.3" > "$TOOLDIR/version.txt";
     fi
@@ -44,7 +44,7 @@ before_install:
 install:
   - if [ ! -d "$HOME/build$XLEN" ] || [ -z "$(ls -A $HOME/build$XLEN)" ] || [ "$(cat "$HOME/build$XLEN/version.txt")" != "$TRAVIS_COMMIT" ]; then
       mkdir -p $TRAVIS_BUILD_DIR/build$XLEN && cd $TRAVIS_BUILD_DIR/build$XLEN;
-      TOOLDIR=$TOOLDIR XLEN=$XLEN ../configure;
+      ../configure --tooldir=$TOOLDIR --xlen=$XLEN;
       source ci/toolchain_env.sh;
       make build -s > /dev/null;
       echo "$TRAVIS_COMMIT" > version.txt;
diff --git a/miscs/docker/Dockerfile.ubuntu b/miscs/docker/Dockerfile.ubuntu
index 6aada88be..a9f007b70 100644
--- a/miscs/docker/Dockerfile.ubuntu
+++ b/miscs/docker/Dockerfile.ubuntu
@@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y \
     build-essential \
     binutils \
     python \
+    python3 \
     uuid-dev \
     git \
     wget \
@@ -16,6 +17,9 @@ RUN apt-get update && apt-get install -y \
     ca-certificates && \
     rm -rf /var/lib/apt/lists/*
 
+# upgrade installed components
+RUN apt-get upgrade && apt-get update
+
 # Clone the Vortex repository
 RUN git clone --depth=1 --recursive https://github.com/vortexgpgpu/vortex.git /vortex
 
@@ -24,17 +28,13 @@ WORKDIR /vortex
 
 # Configure the build folder
 RUN mkdir build && cd build && \
-    TOOLDIR=$HOME/tools ../configure
+    ../configure --tooldir=$HOME/tools
 
 # Install prebuilt toolchain
 RUN cd build && ./ci/toolchain_install.sh --all
 
 # Source tools environment variables and add to bashrc
-RUN source source /vortex/build/ci/toolchain_env.sh
 RUN echo "source /vortex/build/ci/toolchain_env.sh" >> ~/.bashrc
 
-# Build Vortex
-RUN cd build && make -s
-
 # Set the working directory to /vortex/build
 WORKDIR /vortex/build
\ No newline at end of file