diff --git a/Dockerfile b/Dockerfile index f3a2dfb..2facdba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,15 +77,10 @@ RUN cd /tmp/ffmpeg-${FFMPEG_VERSION} && \ emmake make -j4 && \ emmake make install -# RUN cd /build && \ -# emcc -L/opt/ffmpeg/lib -I/opt/ffmpeg/include/ src/main.c \ -# -s EXPORTED_FUNCTIONS='["_version", "_openfile"]' \ -# -s EXTRA_EXPORTED_RUNTIME_METHODS="[FS, cwrap, ccall, setValue, writeAsciiToMemory]" \ -# -s INITIAL_MEMORY=268435456 \ -# -lavcodec -lavformat -lavfilter -lavdevice -lswresample -lswscale -lavutil -lm -lx264 -pthread \ -# -o ffprobe-web-analyzer.js + +COPY ./src/ffprobe-web-analyzer-wrapper.cpp /build/src/ffprobe-web-analyzer-wrapper.cpp +COPY ./Makefile /build/Makefile WORKDIR /build -# COPY ./src/main.c /build/src/main.c -COPY ./Makefile /build/Makefile -# RUN make \ No newline at end of file + +RUN make \ No newline at end of file diff --git a/Makefile b/Makefile index 63bcf94..c130309 100644 --- a/Makefile +++ b/Makefile @@ -8,5 +8,5 @@ dist/ffprobe-web-analyzer.js: -s INITIAL_MEMORY=268435456 \ -pthread \ -lavcodec -lavformat -lavfilter -lavdevice -lswresample -lswscale -lavutil -lm -lx264 -pthread \ - -o www/public/ffprobe-web-analyzer.js \ - src/main.cpp \ No newline at end of file + -o dist/ffprobe-web-analyzer.js \ + src/ffprobe-web-analyzer-wrapper.cpp \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..8f665bf --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +mkdir -p dist +docker build -t ffprobe-web-analyzer . +docker create -ti --name ffprobe-web-analyzer-container ffprobe-web-analyzer +docker cp ffprobe-web-analyzer-container:/build/dist/ . +docker rm -fv ffprobe-web-analyzer-container \ No newline at end of file diff --git a/src/main.cpp b/src/ffprobe-web-analyzer-wrapper.cpp similarity index 100% rename from src/main.cpp rename to src/ffprobe-web-analyzer-wrapper.cpp