Formatting, remove user, don't remove config script after running

Author: JesseWilliamson

webots-docker/Dockerfile

@@ -8,9 +8,15 @@ ARG WEBOTS_PACKAGE_PREFIX=
 # Disable dpkg/gdebi interactive dialogs
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install --yes wget bzip2 && rm -rf /var/lib/apt/lists/ && \
- wget https://github.com/cyberbotics/webots/releases/download/$WEBOTS_VERSION/webots-$WEBOTS_VERSION-x86-64$WEBOTS_PACKAGE_PREFIX.tar.bz2 && \
- tar xjf webots-*.tar.bz2 && rm webots-*.tar.bz2
+RUN apt-get update
+RUN apt-get install --yes \
+  wget\
+  bzip2
+
+RUN rm -rf /var/lib/apt/lists/
+RUN wget https://github.com/cyberbotics/webots/releases/download/$WEBOTS_VERSION/webots-$WEBOTS_VERSION-x86-64$WEBOTS_PACKAGE_PREFIX.tar.bz2
+RUN tar xjf webots-*.tar.bz2 
+RUN rm webots-*.tar.bz2
 
 FROM ${BASE_IMAGE}
 
@@ -19,13 +25,25 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 
 # Install Webots runtime dependencies
-RUN apt-get update && apt-get install --yes wget xvfb git python3-pip sudo && rm -rf /var/lib/apt/lists/ && \
-  wget https://raw.githubusercontent.com/cyberbotics/webots/master/scripts/install/linux_runtime_dependencies.sh && \
-  chmod +x linux_runtime_dependencies.sh && ./linux_runtime_dependencies.sh && rm ./linux_runtime_dependencies.sh
+RUN apt-get update
+RUN apt-get install --yes \
+  wget \
+  xvfb \
+  git \
+  python3-pip 
+  
+RUN rm -rf /var/lib/apt/lists/
+RUN wget https://raw.githubusercontent.com/cyberbotics/webots/master/scripts/install/linux_runtime_dependencies.sh 
+RUN chmod +x linux_runtime_dependencies.sh
+RUN ./linux_runtime_dependencies.sh
+RUN rm ./linux_runtime_dependencies.sh
 
 # Install NUWebots dependencies
-RUN wget https://raw.githubusercontent.com/NUbots/NUWebots/main/webots-docker/dependencies.sh && \
- chmod +x dependencies.sh && ./dependencies.sh && rm ./dependencies.sh && rm -rf /var/lib/apt/lists/
+RUN wget https://raw.githubusercontent.com/NUbots/NUWebots/williamson/webots-docker/webots-docker/dependencies.sh
+RUN chmod +x dependencies.sh
+RUN ./dependencies.sh 
+RUN rm ./dependencies.sh
+RUN rm -rf /var/lib/apt/lists/
 
 # Install Webots
 WORKDIR /usr/local
@@ -37,29 +55,33 @@ ENV PATH /usr/local/webots:${PATH}
 # Enable OpenGL capabilities
 ENV NVIDIA_DRIVER_CAPABILITIES=graphics
 
-RUN useradd -ms /bin/bash webots && usermod -aG sudo webots && echo "webots ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
-ENV HOME=/home/webots
-USER webots
+# RUN useradd -ms /bin/bash webots && usermod -aG sudo webots && echo "webots ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
+# ENV HOME=/home/webots
+# USER webots
 
-WORKDIR $HOME
+# WORKDIR $HOME
 
 # Build the latest version of the RoboCup Humanoid TC fork of GameController
-RUN git clone https://github.com/RoboCup-Humanoid-TC/GameController ./GameController && cd GameController && ant
+RUN git clone https://github.com/RoboCup-Humanoid-TC/GameController ./GameController 
+RUN cd GameController && ant
 
 # Build the robocup controllers
-RUN git clone https://github.com/RoboCup-Humanoid-TC/hlvs_webots.git ./hlvs_webots && \
- pip3 install -r ./hlvs_webots/controllers/referee/requirements.txt && make -j$(nproc) -C ./hlvs_webots
+RUN git clone https://github.com/RoboCup-Humanoid-TC/hlvs_webots.git ./hlvs_webots
+RUN pip3 install -r ./hlvs_webots/controllers/referee/requirements.txt
+RUN make -j$(nproc) -C ./hlvs_webots
 
 # Set environment variables for GameController
-ENV GAME_CONTROLLER_HOME=${HOME}/GameController JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ENV GAME_CONTROLLER_HOME=/GameController JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
 
 # Install the NUbots-developed environment
-RUN git clone https://github.com/NUbots/NUWebots.git ./NUWebots && cd ./NUWebots && pip3 install -r ./requirements.txt && \
- ./b configure -- -DENABLE_CLANG_TIDY=OFF && ./b build
-
-RUN wget https://raw.githubusercontent.com/NUbots/NUWebots/main/webots-docker/webots-config.py && \
- wget https://raw.githubusercontent.com/NUbots/NUWebots/main/webots-docker/entrypoint.sh && \
- chmod +x entrypoint.sh
+RUN git clone https://github.com/NUbots/NUWebots /NUWebots
+RUN pip3 install -r /NUWebots/requirements.txt
+RUN /NUWebots/b configure -- -DENABLE_CLANG_TIDY=OFF
+RUN /NUWebots/b build
+
+RUN wget https://raw.githubusercontent.com/NUbots/NUWebots/williamson/webots-docker/webots-docker/entrypoint.sh
+RUN wget https://raw.githubusercontent.com/NUbots/NUWebots/williamson/webots-docker/webots-docker/webots-config.py
+RUN chmod +x entrypoint.sh
 
 # Configure robocup game.json file based on environment variables
 ENTRYPOINT ["./entrypoint.sh"]

webots-docker/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-python3 docker-config.py ${HOME}/hlvs_webots/controllers/referee/game.json
-rm docker-config.py
+python3 webots-config.py /hlvs_webots/controllers/referee/game.json
 # Run the command given by CMD or docker run parameter, replacing current process
 exec "$@"

webots-docker/webots-config.py

@@ -1,15 +1,19 @@
-import json, os, sys
+import json
+import os
+import sys
 
-TEAM_NAME = os.environ.get('TEAM_NAME')
-ROBOT_HOSTS = os.environ.get('ROBOT_HOSTS')
+TEAM_NAME = os.environ.get("TEAM_NAME")
+ROBOT_HOSTS = os.environ.get("ROBOT_HOSTS")
 
 filename = sys.argv[1]
 
-with open(filename, 'r') as f:
+with open(filename, "r") as f:
     game_config = json.load(f)
 
-if TEAM_NAME: game_config['red']['config'] = 'teams/' + TEAM_NAME + '.json'
-if ROBOT_HOSTS: game_config['red']['hosts'] += ROBOT_HOSTS.split(",")
+if TEAM_NAME:
+    game_config["red"]["config"] = "teams/" + TEAM_NAME + ".json"
+if ROBOT_HOSTS:
+    game_config["red"]["hosts"] += ROBOT_HOSTS.split(",")
 
-with open(filename, 'w') as f:
+with open(filename, "w") as f:
     json.dump(game_config, f, indent=2)