fix: reset to upstream
This commit is contained in:
parent
9cf92aa28f
commit
a4f990fdd6
8 changed files with 50 additions and 17 deletions
8
.idea/.gitignore
vendored
Normal file
8
.idea/.gitignore
vendored
Normal file
|
@ -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
|
2
.idea/OrcaSlicer.iml
Normal file
2
.idea/OrcaSlicer.iml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module classpath="CMake" type="CPP_MODULE" version="4" />
|
7
.idea/codeStyles/Project.xml
Normal file
7
.idea/codeStyles/Project.xml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<code_scheme name="Project" version="173">
|
||||||
|
<clangFormatSettings>
|
||||||
|
<option name="ENABLED" value="true" />
|
||||||
|
</clangFormatSettings>
|
||||||
|
</code_scheme>
|
||||||
|
</component>
|
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
|
</state>
|
||||||
|
</component>
|
4
.idea/misc.xml
Normal file
4
.idea/misc.xml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
|
||||||
|
</project>
|
8
.idea/modules.xml
Normal file
8
.idea/modules.xml
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/OrcaSlicer.iml" filepath="$PROJECT_DIR$/.idea/OrcaSlicer.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
6
.idea/vcs.xml
Normal file
6
.idea/vcs.xml
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
27
Dockerfile
27
Dockerfile
|
@ -1,12 +1,6 @@
|
||||||
FROM docker.io/ubuntu:22.04
|
FROM docker.io/ubuntu:22.04
|
||||||
LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
|
LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
|
||||||
|
|
||||||
# Declare build arguments
|
|
||||||
ARG USER=root
|
|
||||||
ARG UID=0
|
|
||||||
ARG GID=0
|
|
||||||
ARG NCORES=1
|
|
||||||
|
|
||||||
# Disable interactive package configuration
|
# Disable interactive package configuration
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
|
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 \
|
RUN echo deb-src http://archive.ubuntu.com/ubuntu \
|
||||||
$(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list
|
$(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 \
|
autoconf \
|
||||||
build-essential \
|
build-essential \
|
||||||
cmake \
|
cmake \
|
||||||
|
@ -60,13 +53,12 @@ RUN apt-get update && apt-get install -y \
|
||||||
# Change your locale here if you want. See the output
|
# Change your locale here if you want. See the output
|
||||||
# of `locale -a` to pick the correct string formatting.
|
# of `locale -a` to pick the correct string formatting.
|
||||||
ENV LC_ALL=en_US.utf8
|
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
|
# Set this so that Orca Slicer doesn't complain about
|
||||||
# the CA cert path on every startup
|
# the CA cert path on every startup
|
||||||
ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
|
ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
|
||||||
|
|
||||||
# Copy project files
|
|
||||||
COPY ./ OrcaSlicer
|
COPY ./ OrcaSlicer
|
||||||
|
|
||||||
WORKDIR OrcaSlicer
|
WORKDIR OrcaSlicer
|
||||||
|
@ -91,12 +83,13 @@ RUN ./BuildLinux.sh -i
|
||||||
# to keep permissions the same. Just in case, defaults
|
# to keep permissions the same. Just in case, defaults
|
||||||
# are root.
|
# are root.
|
||||||
SHELL ["/bin/bash", "-l", "-c"]
|
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
|
# Using an entrypoint instead of CMD because the binary
|
||||||
RUN if [ "$UID" != "0" ]; then \
|
# accepts several command line arguments.
|
||||||
groupadd -f -g "$GID" "$USER" && \
|
|
||||||
useradd -u "$UID" -g "$GID" "$USER"; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set entrypoint
|
|
||||||
ENTRYPOINT ["/OrcaSlicer/build/package/bin/orca-slicer"]
|
ENTRYPOINT ["/OrcaSlicer/build/package/bin/orca-slicer"]
|
||||||
|
|
Loading…
Reference in a new issue