From 63d65c0b2e07623fcb2c53bf8ee4f2aaa6fbdd38 Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Wed, 22 Sep 2021 01:53:48 -0400
Subject: [PATCH] Try new approach, this time starting with ubuntu-based
 official emsdk image

---
 povray_wasm/Dockerfile                 | 35 +++-----------------------
 povray_wasm/Dockerfile.alpine          | 34 +++++++++++++++++++++++++
 povray_wasm/{build.sh => build_old.sh} |  0
 3 files changed, 37 insertions(+), 32 deletions(-)
 create mode 100644 povray_wasm/Dockerfile.alpine
 rename povray_wasm/{build.sh => build_old.sh} (100%)

diff --git a/povray_wasm/Dockerfile b/povray_wasm/Dockerfile
index d179c46..c355ba6 100644
--- a/povray_wasm/Dockerfile
+++ b/povray_wasm/Dockerfile
@@ -1,34 +1,5 @@
-FROM frolvlad/alpine-gxx
+#!/bin/bash
 
-RUN apk update
+FROM emscripten/emsdk:latest
 
-RUN apk add --update \
-	bash \
-	git \
-	coreutils \
-	build-base \
-	boost-dev \
-	zlib-dev \
-	libpng-dev \
-	jpeg-dev \
-	tiff-dev \
-	openexr-dev \
-	sdl-dev \
-	autoconf \
-	automake \ 
-	make
-
-RUN pwd
-
-WORKDIR /usr/src/
-
-RUN cd /usr/src/ && git clone https://github.com/emscripten-core/emsdk.git emsdk
-
-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
+RUN ls
\ No newline at end of file
diff --git a/povray_wasm/Dockerfile.alpine b/povray_wasm/Dockerfile.alpine
new file mode 100644
index 0000000..d179c46
--- /dev/null
+++ b/povray_wasm/Dockerfile.alpine
@@ -0,0 +1,34 @@
+FROM frolvlad/alpine-gxx
+
+RUN apk update
+
+RUN apk add --update \
+	bash \
+	git \
+	coreutils \
+	build-base \
+	boost-dev \
+	zlib-dev \
+	libpng-dev \
+	jpeg-dev \
+	tiff-dev \
+	openexr-dev \
+	sdl-dev \
+	autoconf \
+	automake \ 
+	make
+
+RUN pwd
+
+WORKDIR /usr/src/
+
+RUN cd /usr/src/ && git clone https://github.com/emscripten-core/emsdk.git emsdk
+
+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.sh b/povray_wasm/build_old.sh
similarity index 100%
rename from povray_wasm/build.sh
rename to povray_wasm/build_old.sh