diff --git a/Dockerfile b/Dockerfile index bb896a5..2d4d150 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# docker image build -t laslaul/nwjs-arm-build-env:v0.47.x . -# docker run -it laslaul/nwjs-arm-build-env:v0.47.x +# docker image build -t laslaul/nwjs-arm-build-env:v0.48.x . +# docker run -it laslaul/nwjs-arm-build-env:v0.48.x # Use the official image as a parent image FROM ubuntu:18.04 diff --git a/build-container.sh b/build-container.sh index da43b0a..aece57a 100755 --- a/build-container.sh +++ b/build-container.sh @@ -2,7 +2,7 @@ set -e -export NWJS_BRANCH="nw47" +export NWJS_BRANCH="nw48" export WORKDIR="/usr/docker" export NWJSDIR="${WORKDIR}/nwjs" export DEPOT_TOOLS_DIRECTORY="${WORKDIR}/depot_tools" @@ -17,7 +17,7 @@ function getNecessaryUbuntuPackages { apt-get -y install apt-utils git curl lsb-release sudo tzdata nano echo "Europe/Zurich" > /etc/timezone dpkg-reconfigure -f noninteractive tzdata - apt-get -y install python + apt-get -y install python python-setuptools apt-get autoclean apt-get autoremove git config --global user.email "you@example.com" diff --git a/build-nwjs.sh b/build-nwjs.sh index 91713c2..a6618da 100755 --- a/build-nwjs.sh +++ b/build-nwjs.sh @@ -85,5 +85,5 @@ build "nwjs_sdk=true enable_nacl=true ffmpeg_branding=\"Chrome\" is_component_ff mkdir -p ${WORKDIR}/dist/nwjs-sdk-chrome-ffmpeg-branding cp ${NWJSDIR}/src/out/nw/dist/** ${WORKDIR}/dist/nwjs-sdk-chrome-ffmpeg-branding -# tar -zcvf v0.47.3.tar.gz dist/* -# docker cp 6c2287d4b8cc:/usr/docker/v0.47.3.tar.gz binaries/ +# tar -zcvf v0.48.4.tar.gz dist/* +# docker cp 957471aa9538:/usr/docker/v0.48.4.tar.gz binaries/ diff --git a/checkout-another-branch.sh b/checkout-another-branch.sh index f640f76..3d17eaf 100755 --- a/checkout-another-branch.sh +++ b/checkout-another-branch.sh @@ -2,7 +2,7 @@ set -e -export NWJS_BRANCH="nw47" +export NWJS_BRANCH="nw48" export WORKDIR="/usr/docker" export NWJSDIR="${WORKDIR}/nwjs" export DEPOT_TOOLS_DIRECTORY="${WORKDIR}/depot_tools"