Provide Browsh version with git in Dockerfile

Version v1.4.6
This commit is contained in:
Thomas Buckley-Houston 2018-07-19 15:25:48 +08:00
parent 26416e267c
commit 1b0d5f103f
3 changed files with 9 additions and 5 deletions

View file

@ -21,7 +21,10 @@ RUN rm ./setup_firefox.sh && rm .travis.yml
# Setup Browsh
ADD ./interfacer/contrib/setup_browsh.sh .
RUN ./setup_browsh.sh
ADD ./interfacer/src/browsh/version.go .
RUN VERSION_FILE=version.go ./setup_browsh.sh
RUN rm ./setup_browsh.sh && rm version.go
# Firefox behaves quite differently to normal on its first run, so by getting
# that over and done with here when there's no user to be dissapointed means
# that all future runs will be consistent.
@ -31,7 +34,6 @@ RUN TERM=xterm script \
/dev/null \
>/dev/null & \
sleep 10
RUN rm ./setup_browsh.sh && rm manifest.json
CMD ["/app/browsh"]

View file

@ -10,8 +10,10 @@
set -e
PROJECT_ROOT=$(git rev-parse --show-toplevel)
version=$($PROJECT_ROOT/contrib/get_browsh_version.sh)
# This will typically be run inside Docker where we don't have the original
# source code.
line=$(cat $VERSION_FILE | grep 'browshVersion')
version=$(echo $line | grep -o '".*"' | sed 's/"//g')
base='https://github.com/browsh-org/browsh/releases/download'
release_url="$base/v$version/browsh_${version}_linux_amd64"

View file

@ -1,3 +1,3 @@
package browsh
var browshVersion = "1.4.5"
var browshVersion = "1.4.6"