Skip to content

Commit

Permalink
Release 20.06.1
Browse files Browse the repository at this point in the history
  • Loading branch information
accetto committed Jun 10, 2020
1 parent f183cf1 commit 454b560
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 14 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

***

### Release 20.06.1

- Quick mitigation of issue [#2 (Firefox 77.0.1 scrambles pages)](https://github.com/accetto/xubuntu-vnc-novnc/issues/2)
- by rolling back **Firefox** to version **76.0.1**

### Release 20.06

- **xubuntu-vnc-novnc**
Expand Down
20 changes: 16 additions & 4 deletions docker/xubuntu-vnc-novnc-firefox/Dockerfile.firefox
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,22 @@ FROM accetto/xubuntu-vnc-novnc:${BASETAG} as stage-firefox
USER 0

### 'apt-get clean' runs automatically
RUN apt-get update && apt-get install -y \
firefox \
&& apt-get -y autoremove \
&& rm -rf /var/lib/apt/lists/*
# RUN apt-get update && apt-get install -y \
# firefox \
# && apt-get -y autoremove \
# && rm -rf /var/lib/apt/lists/*

### Mitigating issue #2 (Firefox 77.0.1 scrambles pages) - rollback to version 76.0.1
### Alternatively install an explicit Firefox version
### http://releases.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/en-US/firefox-67.0.4.tar.bz2
ENV \
FIREFOX_VERSION=76.0.1 \
FIREFOX_DISTRO=linux-x86_64 \
FIREFOX_PATH=/usr/lib/firefox
RUN mkdir -p ${FIREFOX_PATH} \
&& wget -qO- http://releases.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/${FIREFOX_DISTRO}/en-US/firefox-${FIREFOX_VERSION}.tar.bz2 \
| tar xvj -C /usr/lib/ \
&& ln -s ${FIREFOX_PATH}/firefox /usr/bin/firefox

### Preconfigure Xfce
COPY [ "./src/firefox/home/Desktop", "${HOME}/Desktop/" ]
Expand Down
20 changes: 16 additions & 4 deletions docker/xubuntu-vnc-novnc-firefox/Dockerfile.firefox.default
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,22 @@ ARG ARG_MOZ_FORCE_DISABLE_E10S
USER 0

### 'apt-get clean' runs automatically
RUN apt-get update && apt-get install -y \
firefox \
&& apt-get -y autoremove \
&& rm -rf /var/lib/apt/lists/*
# RUN apt-get update && apt-get install -y \
# firefox \
# && apt-get -y autoremove \
# && rm -rf /var/lib/apt/lists/*

### Mitigating issue #2 (Firefox 77.0.1 scrambles pages) - rollback to version 76.0.1
### Alternatively install an explicit Firefox version
### http://releases.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/en-US/firefox-67.0.4.tar.bz2
ENV \
FIREFOX_VERSION=76.0.1 \
FIREFOX_DISTRO=linux-x86_64 \
FIREFOX_PATH=/usr/lib/firefox
RUN mkdir -p ${FIREFOX_PATH} \
&& wget -qO- http://releases.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/${FIREFOX_DISTRO}/en-US/firefox-${FIREFOX_VERSION}.tar.bz2 \
| tar xvj -C /usr/lib/ \
&& ln -s ${FIREFOX_PATH}/firefox /usr/bin/firefox

### Preconfigure Xfce
COPY [ "./src/firefox/home/Desktop", "${HOME}/Desktop/" ]
Expand Down
6 changes: 3 additions & 3 deletions docker/xubuntu-vnc-novnc-firefox/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,18 +244,18 @@ Credit goes to all the countless people and companies, who contribute to open so

<!-- latest tag badges -->

[badge-VERSION_STICKER_LATEST]: https://badgen.net/badge/version%20sticker/ubuntu18.04.4-firefox77.0.1/blue
[badge-VERSION_STICKER_LATEST]: https://badgen.net/badge/version%20sticker/ubuntu18.04.4-firefox76.0.1/blue

[badge-github-commit-latest]: https://images.microbadger.com/badges/commit/accetto/xubuntu-vnc-novnc-firefox.svg

<!-- default tag badges -->

[badge-VERSION_STICKER_DEFAULT]: https://badgen.net/badge/version%20sticker/ubuntu18.04.4-firefox77.0.1/blue
[badge-VERSION_STICKER_DEFAULT]: https://badgen.net/badge/version%20sticker/ubuntu18.04.4-firefox76.0.1/blue

[badge-github-commit-default]: https://images.microbadger.com/badges/commit/accetto/xubuntu-vnc-novnc-firefox:default.svg

<!-- multiprocess tag badges -->

[badge-VERSION_STICKER_MULTIPROCESS]: https://badgen.net/badge/version%20sticker/ubuntu18.04.4-firefox77.0.1/blue
[badge-VERSION_STICKER_MULTIPROCESS]: https://badgen.net/badge/version%20sticker/ubuntu18.04.4-firefox76.0.1/blue

[badge-github-commit-multiprocess]: https://images.microbadger.com/badges/commit/accetto/xubuntu-vnc-novnc-firefox:multiprocess.svg
6 changes: 3 additions & 3 deletions docker/xubuntu-vnc-novnc-firefox/hooks/env
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ TODAY=$(date +%Y-%m-%d)
VERSION_STICKER=""

### Warning! The values must be explicit strings (used by utils).
VERSION_STICKER_LATEST="ubuntu18.04.4-firefox77.0.1"
VERSION_STICKER_DEFAULT="ubuntu18.04.4-firefox77.0.1"
VERSION_STICKER_MULTIPROCESS="ubuntu18.04.4-firefox77.0.1"
VERSION_STICKER_LATEST="ubuntu18.04.4-firefox76.0.1"
VERSION_STICKER_DEFAULT="ubuntu18.04.4-firefox76.0.1"
VERSION_STICKER_MULTIPROCESS="ubuntu18.04.4-firefox76.0.1"

case "${DOCKER_TAG}" in

Expand Down

0 comments on commit 454b560

Please sign in to comment.