diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..13566b81b --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/OrcaSlicer.iml b/.idea/OrcaSlicer.iml new file mode 100644 index 000000000..f08604bb6 --- /dev/null +++ b/.idea/OrcaSlicer.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 000000000..f60388162 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 000000000..79ee123c2 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..79b3c9483 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..b80725f1d --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5e8c8274a..868779b0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,6 @@ FROM docker.io/ubuntu:22.04 LABEL maintainer "DeftDawg " -# Declare build arguments -ARG USER=root -ARG UID=0 -ARG GID=0 -ARG NCORES=1 - # Disable interactive package configuration RUN apt-get update && \ echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections @@ -15,8 +9,7 @@ RUN apt-get update && \ RUN echo deb-src http://archive.ubuntu.com/ubuntu \ $(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list -# Install dependencies -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y \ autoconf \ build-essential \ cmake \ @@ -60,13 +53,12 @@ RUN apt-get update && apt-get install -y \ # Change your locale here if you want. See the output # of `locale -a` to pick the correct string formatting. ENV LC_ALL=en_US.utf8 -RUN locale-gen "$LC_ALL" +RUN locale-gen $LC_ALL # Set this so that Orca Slicer doesn't complain about # the CA cert path on every startup ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt -# Copy project files COPY ./ OrcaSlicer WORKDIR OrcaSlicer @@ -91,12 +83,13 @@ RUN ./BuildLinux.sh -i # to keep permissions the same. Just in case, defaults # are root. SHELL ["/bin/bash", "-l", "-c"] +ARG USER=root +ARG UID=0 +ARG GID=0 +RUN [[ "$UID" != "0" ]] \ + && groupadd -f -g $GID $USER \ + && useradd -u $UID -g $GID $USER -# Create user if not root -RUN if [ "$UID" != "0" ]; then \ - groupadd -f -g "$GID" "$USER" && \ - useradd -u "$UID" -g "$GID" "$USER"; \ - fi - -# Set entrypoint +# Using an entrypoint instead of CMD because the binary +# accepts several command line arguments. ENTRYPOINT ["/OrcaSlicer/build/package/bin/orca-slicer"]