Preparation for fixing up docker

Kokika · Oct 1, 2024 · 7a46969 · 7a46969
1 parent 64025aa
commit 7a46969
Show file tree

Hide file tree

Showing 7 changed files with 627 additions and 29 deletions.
diff --git a/docker/Dockerfile_binary b/docker/Dockerfile_binary
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=nvidia/cudagl:10.0-devel-ubuntu18.04
+ARG BASE_IMAGE=ghcr.io/epicgames/unreal-engine:runtime
 FROM $BASE_IMAGE
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends \
@@ -12,7 +12,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-ins
 
 RUN python3 -m pip install --upgrade pip && \
     pip3 install setuptools wheel && \
-    pip3 install airsim
+    pip3 install cosysairsim
 
 RUN adduser --force-badname --disabled-password --gecos '' --shell /bin/bash airsim_user && \
 	echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \

diff --git a/docker/Dockerfile_source b/docker/Dockerfile_source
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=adamrehn/ue4-engine:4.19.2-cudagl10.0
+ARG BASE_IMAGE=ghcr.io/epicgames/unreal-engine:dev-5.4.3
 FROM $BASE_IMAGE
 
 USER root
@@ -9,13 +9,13 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-ins
     x11-xserver-utils
 
 RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
-    adduser ue4 sudo 
+    adduser ue5 sudo
 
-USER ue4
-RUN cd /home/ue4 && \
+USER ue5
+RUN cd /home/ue5 && \
 	git clone --progress https://github.com/Cosys-Lab/Cosys-AirSim.git && \
 	cd AirSim && \
 	./setup.sh && \
 	./build.sh
 
-WORKDIR /home/ue4
+WORKDIR /home/ue5
diff --git a/docker/build_airsim_image.py b/docker/build_airsim_image.py
@@ -14,15 +14,15 @@ def build_docker_image(args):
     dockerfile = 'Dockerfile_source'
     if args.source:
         if not args.base_image:
-            args.base_image = "adamrehn/ue4-engine:4.19.2-cudagl10.0"
+            args.base_image = "ghcr.io/epicgames/unreal-engine:runtime"
         target_image_tag = args.base_image.split(":")[1] # take tag from base image
         if not args.target_image:
             args.target_image = 'airsim_source' + ':' + target_image_tag
 
     else:
         dockerfile = 'Dockerfile_binary'
         if not args.base_image:
-            args.base_image = "nvidia/cudagl:10.0-devel-ubuntu18.04"
+            args.base_image = "ghcr.io/epicgames/unreal-engine:dev-5.4.3"
         target_image_tag = args.base_image.split(":")[1] # take tag from base image
         if not args.target_image:
             args.target_image = 'airsim_binary' + ':' + target_image_tag

diff --git a/docker/download_blocks_env_binary.sh b/docker/download_blocks_env_binary.sh
@@ -5,6 +5,6 @@ if ! which unzip; then
     sudo apt-get install unzip
 fi
 
-wget -c https://github.com/microsoft/AirSim/releases/download/v1.6.0-linux/Blocks.zip 
-unzip -q Blocks.zip
-rm Blocks.zip
+wget -c https://github.com/Cosys-Lab/Cosys-AirSim/releases/download/5.4-v3.1/Blocks_package_54_31.zip
+unzip -q Blocks_package_54_31.zip
+rm Blocks_package_54_31.zip