.gitea/workflows/docker-build.yml

@@ -14,17 +14,8 @@ jobs:
 
     - name: Get repository code
       uses: actions/checkout@v4
-
-    - name: ARM64 add QEMU 
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: arm64
-    - name: ARM64 setup Docker buildx 
-      uses: docker/setup-buildx-action@v3
-
     - name: Build the images
       run: bash ./build-images.sh -no-updates
-
     - name: Docker login
       uses: docker/login-action@v3
       with:

Readme.md

@@ -1,5 +0,0 @@
-> [!NOTE]  
-> In diesem Repository befinden sich die Quelldaten und Skripte zur Erstellung der Docker-Base-Images.
-
-> [!WARNING]
-> Um die Plattform zu benutzen, bitte das [Agent-Template](https://git.chai.uni-hamburg.de/UMS-Agenten/Agent-Template) benutzen!

build-images.sh

@@ -17,8 +17,8 @@ fi;
 for platform in $PLATFORMS; do
 	if [ "$platform" == "gpu" ]; then 
 		platform="amd64"
-		from_image="$IMAGE_REGISTRY/$IMAGE_OWNER/$IMAGE_NAME:tmp-local-only"
+		from_image="tmp_local/gpu_baseimage:amd64"
-		tag_image="$IMAGE_REGISTRY/$IMAGE_OWNER/$IMAGE_NAME:gpu-amd64"
+		tag_image="$IMAGE_OWNER/$IMAGE_NAME:gpu-amd64"
 
 		docker build \
 			--pull \
@@ -28,7 +28,7 @@ for platform in $PLATFORMS; do
 			"$SCRIPTPATH"
 	else
 		from_image="$CPU_BASEIMAGE"
-		tag_image="$IMAGE_REGISTRY/$IMAGE_OWNER/$IMAGE_NAME:cpu-$platform"
+		tag_image="$IMAGE_OWNER/$IMAGE_NAME:cpu-$platform"
 
 		docker pull --platform "linux/$platform" "$BASEIMAGE"
 	fi;

docker/Dockerfile

@@ -29,21 +29,13 @@ RUN apt-get update \
 		curl wget \
 		htop screen
 
-# if cpu container (install cpu only versions; for gpu, gpu versions)
+RUN python3 -m pip install --no-cache-dir --break-system-packages \
-RUN if [ ! -d /usr/local/cuda/ ]; then \
+    torch --index-url https://download.pytorch.org/whl/cpu
-		python3 -m pip install --no-cache-dir --break-system-packages \
-			torch --index-url https://download.pytorch.org/whl/cpu; \
-		python3 -m pip install --no-cache-dir --break-system-packages \
-			faiss-cpu; \
-	else \
-		python3 -m pip install --no-cache-dir --break-system-packages \
-			faiss-gpu-cu12; \
-	fi;
 
-RUN mkdir -p /ums-agenten/persist/
+RUN mkdir /ums-agenten/
 
-ENV NLTK_DATA=/ums-agenten/persist/nltk/
+ENV NLTK_DATA=/ums-agenten/nltk/
-ENV HF_HOME=/ums-agenten/persist/hf_home/
+ENV HF_HOME=/ums-agenten/hf_home/
 
 COPY ./docker/$PIP_REQ_FILE /ums-agenten/requirements.txt
 RUN pip3 install --break-system-packages --no-cache-dir -r /ums-agenten/requirements.txt \

docker/Dockerfile.gpu

@@ -20,9 +20,13 @@ RUN apt update && \
 		libopenmpi-dev && \
 	rm -rf /var/lib/apt/lists
 
-RUN python3 -m pip install --no-cache-dir --break-system-packages \
+RUN python3 -m pip install --no-cache-dir \
     torch --index-url https://download.pytorch.org/whl/cu124
 
+RUN git clone https://github.com/NVIDIA/apex
+RUN cd apex && \
+    pip install -v --disable-pip-version-check --no-cache-dir --no-build-isolation --config-settings "--build-option=--cpp_ext" --config-settings "--build-option=--cuda_ext" ./
+
 # fix library path for tensorflow and link a file
 ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/lib64"
 RUN ln -s /usr/local/cuda/lib64/libcusolver.so.11 /usr/local/cuda/lib64/libcusolver.so.10

docker/requirements.txt

@@ -17,6 +17,7 @@ matplotlib
 
 transformers
 huggingface_hub
+faiss-cpu
 datasets
 accelerate
 peft

push-images.sh

@@ -7,7 +7,7 @@ source "$SCRIPTPATH/vars.sh"
 
 day_tag=$(date '+%Y-%m-%d')
 
-docker image ls "$IMAGE_REGISTRY/$IMAGE_OWNER/$IMAGE_NAME" --format '{{.Tag}}' | while read image_tag ;
+docker image ls "$IMAGE_OWNER/$IMAGE_NAME" --format '{{.Tag}}' | while read image_tag ;
 do
 
 	if [[ "$image_tag" =~ ^((gpu)|(cpu))-((arm64)|(amd64))$ ]];