Update Dockerfile

Dockerfile

@@ -6,51 +6,29 @@ RUN apt-get update && \
 
 # Copy backend server files
 COPY build/ /app/build/
-COPY entrypoint_combined.sh /app/entrypoint_combined.sh
-
-# Set permissions and create logs directory
-RUN chmod +x /app/build/tanks.x86_64 && \
-    chmod +x /app/entrypoint_combined.sh && \
-    mkdir -p /app/logs
-
-# Set workdir
-WORKDIR /app/
-
-FROM nginx:alpine as web_client
-
-# Copy WebGL build files
-COPY webgl-build /usr/share/nginx/html
-
-# Copy Nginx configuration files
 COPY etc/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY etc/nginx/conf.d /etc/nginx/conf.d
-
-# Copy HTML page for port 7860
+COPY webgl-build /usr/share/nginx/html
 COPY html-page /usr/share/nginx/html-page
 
-FROM ubuntu:bionic
+# Set permissions and create logs directory
+RUN chmod +x /app/build/tanks.x86_64 && \
+    mkdir -p /app/logs && \
+    mkdir -p /var/log/nginx /var/lib/nginx && \
+    chown -R www-data:www-data /var/log/nginx /var/lib/nginx /app /usr/share/nginx/html /usr/share/nginx/html-page
 
-# Install necessary packages for backend and Nginx
+# Install Nginx
 RUN apt-get update && \
-    apt-get install -y libglu1 xvfb libxcursor1 net-tools nginx
+    apt-get install -y nginx
 
-# Create necessary directories and set permissions
-RUN mkdir -p /var/log/nginx /var/lib/nginx && \
-    chown -R www-data:www-data /var/log/nginx /var/lib/nginx
-
-# Copy files from previous stages
-COPY --from=backend /app/ /app/
-COPY --from=web_client /usr/share/nginx/html /usr/share/nginx/html
-COPY --from=web_client /usr/share/nginx/html-page /usr/share/nginx/html-page
-COPY --from=web_client /etc/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY --from=web_client /etc/nginx/conf.d /etc/nginx/conf.d
-
-# Set permissions for the copied files
-RUN chown -R www-data:www-data /app /usr/share/nginx/html /usr/share/nginx/html-page && \
-    chmod -R 755 /app/build /usr/share/nginx/html /usr/share/nginx/html-page
+# Set workdir
+WORKDIR /app/
 
 # Expose necessary ports
 EXPOSE 80 7777/udp 7778/tcp 7860
 
-# Entry point script
-ENTRYPOINT ["/bin/bash", "/app/entrypoint_combined.sh"]
+# Combine backend server and Nginx start commands
+CMD xvfb-run -ae /dev/stdout \
+    --server-args='-screen 0 640x480x24:32' \
+    /app/build/tanks.x86_64 -batchmode -nographics -logfile /app/logs/server.log & \
+    nginx -g 'daemon off;'