diff --git a/povray_wasm/Dockerfile b/povray_wasm/Dockerfile index 1d70a70..1c24c25 100644 --- a/povray_wasm/Dockerfile +++ b/povray_wasm/Dockerfile @@ -1,5 +1,5 @@ -FROM emscripten/emsdk:2.0.26 +FROM alpine:latest -RUN DEBIAN_FRONTEND=noninteractive apt update +RUN apk update -RUN DEBIAN_FRONTEND=noninteractive apt install -y bash libz-dev libpng-dev libjpeg-dev libtiff-dev libopenexr-dev autoconf automake make libboost-all-dev \ No newline at end of file +RUN apk add --update boost-dev zlib-dev libpng-dev jpeg-dev tiff-dev openexr-dev autoconf automake emscriptenmake diff --git a/povray_wasm/Dockerfile.ubuntu b/povray_wasm/Dockerfile.ubuntu new file mode 100644 index 0000000..1d70a70 --- /dev/null +++ b/povray_wasm/Dockerfile.ubuntu @@ -0,0 +1,5 @@ +FROM emscripten/emsdk:2.0.26 + +RUN DEBIAN_FRONTEND=noninteractive apt update + +RUN DEBIAN_FRONTEND=noninteractive apt install -y bash libz-dev libpng-dev libjpeg-dev libtiff-dev libopenexr-dev autoconf automake make libboost-all-dev \ No newline at end of file diff --git a/povray_wasm/build_alpine.sh b/povray_wasm/build_alpine.sh new file mode 100644 index 0000000..5e5ab2e --- /dev/null +++ b/povray_wasm/build_alpine.sh @@ -0,0 +1,8 @@ +EMAIL="himattmcwilliams@gmail.com" +NAME="Matt McWilliams" + +cd unix/ +sh prebuild.sh +cd ../ +emconfigure ./configure COMPILED_BY="$NAME <$EMAIL>" +emmake make -j \ No newline at end of file diff --git a/povray_wasm/build_with_alpine.sh b/povray_wasm/build_with_alpine.sh new file mode 100644 index 0000000..ca87ccd --- /dev/null +++ b/povray_wasm/build_with_alpine.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +#latest-stable +POVRAY_VERSION=latest-stable +#v3.7.0.0 + +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 + +cd povray + +sudo docker run \ + -v $PWD:/usr/src \ + povray_wasm \ + sh -c 'cd /usr/src && bash build.sh' \ No newline at end of file diff --git a/povray_wasm/build_with_docker.sh b/povray_wasm/build_with_docker.sh index 18924ff..e28510d 100644 --- a/povray_wasm/build_with_docker.sh +++ b/povray_wasm/build_with_docker.sh @@ -1,7 +1,8 @@ #!/bin/bash #latest-stable -POVRAY_VERSION=v3.7.0.0 +POVRAY_VERSION=latest-stable +#v3.7.0.0 if [ ! -d povray ]; then git clone --depth 1 --branch $POVRAY_VERSION https://github.com/POV-Ray/povray povray