Update Dockerfile

Dockerfile

@@ -1,43 +1,40 @@
-#FROM dperson/openvpn-client
-FROM nikolaik/python-nodejs:python3.9-nodejs18
-
-ENV USERNAME=admin
-# Create and use a non-root user
-RUN useradd -ms /bin/bash $USERNAME
-
-# Set working directory for the application
-WORKDIR /app
-
-
-RUN apt-get update -y && apt-get upgrade -y \
-    && apt-get install -y --no-install-recommends ffmpeg \
-    #&& apt-get install -y openvpn \
-    && apt-get install -y git-all \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-    
-ENV HOME=/home/$USERNAME
-RUN mkdir $HOME/.cache $HOME/.config \
- && chmod -R 777 $HOME
-
-ENV PATH=$HOME/.local/bin:$PATH
-
-COPY init.sh /app/init.sh
-RUN chmod +x /app/init.sh
-RUN /app/init.sh
-
-# Set ownership and permissions for the app directory
-RUN chown -R admin:admin /app && chmod -R 777 /app
-
-# Switch to the non-root user for better security
-USER admin
-
-# Expose the port the application will run on
-EXPOSE 7860
-
-# Use init.sh as the entrypoint so it runs on container start
-ENTRYPOINT ["/app/init.sh"]
-# Run the VPN script when the container starts
-
-#CMD ["sh","/start_vpn.sh"]
-CMD ["python", "-u","-m", "YukkiMusic"]
+FROM nikolaik/python-nodejs:python3.9-nodejs18
+
+ENV USERNAME=admin
+
+# Create and use a non-root user
+RUN useradd -ms /bin/bash $USERNAME
+
+WORKDIR /app
+
+# install required packages in one layer
+RUN apt-get update -y && apt-get upgrade -y \
+    && apt-get install -y --no-install-recommends ffmpeg git-all \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV HOME=/home/$USERNAME
+RUN mkdir -p $HOME/.cache $HOME/.config \
+ && chmod -R 777 $HOME
+
+ENV PATH=$HOME/.local/bin:$PATH
+
+# copy init script
+COPY init.sh /app/init.sh
+
+# Ensure line endings are unix-style and script is executable, then run it
+RUN sed -i 's/\r$//' /app/init.sh \
+ && chmod +x /app/init.sh \
+ && echo "---- init.sh head ----" && head -n 3 /app/init.sh || true \
+ && /bin/bash /app/init.sh
+
+# Set ownership and permissions for the app directory
+RUN chown -R admin:admin /app && chmod -R 777 /app
+
+# Switch to non-root user
+USER admin
+
+EXPOSE 7860
+
+ENTRYPOINT ["/app/init.sh"]
+CMD ["python", "-u", "-m", "YukkiMusic"]