This is an automated email from the ASF dual-hosted git repository.

yasith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new 9a465a2cbd fix devcontainer dockerfile
9a465a2cbd is described below

commit 9a465a2cbdc16c60cc44051014d4ada75f5dea62
Author: yasithdev <[email protected]>
AuthorDate: Fri Jul 4 21:29:01 2025 -0500

    fix devcontainer dockerfile
---
 .devcontainer/Dockerfile | 62 ++++++++++++++++++------------------------------
 1 file changed, 23 insertions(+), 39 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 8aa0dbe505..2e254d3142 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,50 +1,29 @@
 FROM ubuntu:22.04
 
+ARG TARGETARCH
+
 # Avoid interactive prompts during package installation
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install system dependencies
-RUN apt-get update && apt-get install -y \
-    curl \
-    wget \
-    git \
-    build-essential \
-    pkg-config \
-    libssl-dev \
-    libffi-dev \
-    python3-dev \
-    python3-pip \
-    python3-venv \
-    software-properties-common \
+# Install system dependencies, python 3.10, and java 17
+RUN apt-get update && \
+    apt-get install -y \
+    curl wget git build-essential pkg-config libssl-dev libffi-dev 
software-properties-common \
+    python3.10 python3.10-dev \
     openjdk-17-jdk \
     && rm -rf /var/lib/apt/lists/*
 
-# Set JAVA_HOME
-ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-ENV PATH=$PATH:$JAVA_HOME/bin
-
-# Install Maven
-RUN wget 
https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
 \
-    && tar -xzf apache-maven-3.9.9-bin.tar.gz \
-    && mv apache-maven-3.9.9 /opt/maven \
-    && rm apache-maven-3.9.9-bin.tar.gz
-
-ENV MAVEN_HOME=/opt/maven
-ENV PATH=$PATH:$MAVEN_HOME/bin
-
-# Install Python 3.10
-RUN apt-get update && apt-get install -y python3.10 python3.10-dev 
python3.10-venv \
-    && rm -rf /var/lib/apt/lists/*
+# Install maven 3.9.10
+RUN wget 
https://dlcdn.apache.org/maven/maven-3/3.9.10/binaries/apache-maven-3.9.10-bin.tar.gz
 \
+    && tar -xzf apache-maven-3.9.10-bin.tar.gz \
+    && mv apache-maven-3.9.10 /opt/maven \
+    && rm apache-maven-3.9.10-bin.tar.gz
 
-# Install Go
+# Install go 1.23.0
 RUN wget https://go.dev/dl/go1.23.0.linux-amd64.tar.gz \
     && tar -C /usr/local -xzf go1.23.0.linux-amd64.tar.gz \
     && rm go1.23.0.linux-amd64.tar.gz
 
-ENV GOROOT=/usr/local/go
-ENV GOPATH=$HOME/go
-ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
-
 # Install Thrift 0.23
 RUN wget https://dlcdn.apache.org/thrift/0.22.0/thrift-0.22.0.tar.gz \
     && tar -xzf thrift-0.22.0.tar.gz \
@@ -55,9 +34,14 @@ RUN wget 
https://dlcdn.apache.org/thrift/0.22.0/thrift-0.22.0.tar.gz \
     && cd .. \
     && rm -rf thrift-0.22.0 thrift-0.22.0.tar.gz
 
-# Create non-root user
-RUN useradd -m -s /bin/bash vscode
-USER vscode
+# Create non-root user (developer)
+RUN useradd -m -s /bin/bash developer
+USER developer
+WORKDIR /home/developer
 
-# Set working directory
-WORKDIR /home/vscode
+# Set environment variables
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-$TARGETARCH
+ENV MAVEN_HOME=/opt/maven
+ENV GOROOT=/usr/local/go
+ENV GOPATH=/home/developer/go
+ENV PATH=$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin:$GOROOT/bin:$GOPATH/bin

Reply via email to