diff --git a/povray_wasm/Dockerfile b/povray_wasm/Dockerfile index 017dba0..d179c46 100644 --- a/povray_wasm/Dockerfile +++ b/povray_wasm/Dockerfile @@ -18,12 +18,17 @@ RUN apk add --update \ automake \ make -RUN git clone https://github.com/emscripten-core/emsdk.git - RUN pwd -RUN cd /emsdk && ./emsdk install latest +WORKDIR /usr/src/ -RUN cd /emsdk && ./emsdk activate latest +RUN cd /usr/src/ && git clone https://github.com/emscripten-core/emsdk.git emsdk -RUN cd /emsdk && source ./emsdk_env.sh \ No newline at end of file +ENV POVRAY_VERSION=3.7-stable +RUN cd /usr/src/ && git clone --depth 1 --branch $POVRAY_VERSION https://github.com/POV-Ray/povray povray + +RUN cd /usr/src/emsdk && ./emsdk install latest + +RUN cd /usr/src/emsdk && ./emsdk activate latest + +RUN cd /usr/src/emsdk && source ./emsdk_env.sh \ No newline at end of file diff --git a/povray_wasm/build_docker.sh b/povray_wasm/build_docker.sh new file mode 100644 index 0000000..d34470a --- /dev/null +++ b/povray_wasm/build_docker.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sudo docker build . -t povray_wasm \ No newline at end of file diff --git a/povray_wasm/compile_alpine.sh b/povray_wasm/compile_alpine.sh index 44caa9f..ac2bd01 100644 --- a/povray_wasm/compile_alpine.sh +++ b/povray_wasm/compile_alpine.sh @@ -1,20 +1,11 @@ #!/bin/bash -#latest-stable#v3.7.0.0 -POVRAY_VERSION=3.7-stable - -if [ ! -d povray ]; then - git clone --depth 1 --branch $POVRAY_VERSION https://github.com/POV-Ray/povray povray -fi - -cp build_alpine.sh povray/build.sh - -sudo docker build . -t povray_wasm +bash ./build_docker.sh cd povray sudo docker run \ --cpus=2 \ - -v $PWD:/usr/src \ + -v $PWD:/usr/src/build \ povray_wasm \ - sh -c 'cd /usr/src && bash build.sh' \ No newline at end of file + sh -c 'cd /usr/src/povray && cp ../build/build_alpine.sh ./build.sh && bash build.sh' \ No newline at end of file