From 60f4d82a6584c205818cbab84677febf42bb8f6c Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Mon, 6 Apr 2020 08:16:08 +0300 Subject: [PATCH] feat: update node version from 8 to 12 --- Dockerfile.amd64 | 10 +++++----- Dockerfile.arm64 | 10 +++++----- Dockerfile.armhf | 10 +++++----- Dockerfile.j2 | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 85101ec..34f8eae 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -8,7 +8,7 @@ FROM ubuntu:18.04 as system -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; +RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; # built-in packages @@ -40,8 +40,8 @@ RUN apt update \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* - - + + # Additional packages require ~600MB # libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw @@ -78,14 +78,14 @@ RUN apt-get update \ FROM ubuntu:18.04 as builder -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; +RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; RUN apt-get update \ && apt-get install -y --no-install-recommends curl ca-certificates gnupg patch # nodejs -RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \ +RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y nodejs # yarn diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 78353e3..2330d3e 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -12,7 +12,7 @@ COPY --from=amd64 /usr/bin/qemu-aarch64-static /usr/bin/ -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; +RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; # built-in packages @@ -44,8 +44,8 @@ RUN apt update \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* - - + + # Additional packages require ~600MB # libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw @@ -78,14 +78,14 @@ RUN apt-get update \ FROM ubuntu:18.04 as builder -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; +RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; RUN apt-get update \ && apt-get install -y --no-install-recommends curl ca-certificates gnupg patch # nodejs -RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \ +RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y nodejs # yarn diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a73e556..7913ab4 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,7 +12,7 @@ COPY --from=amd64 /usr/bin/qemu-arm-static /usr/bin/ -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; +RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; # built-in packages @@ -44,8 +44,8 @@ RUN apt update \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* - - + + # Additional packages require ~600MB # libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw @@ -78,14 +78,14 @@ RUN apt-get update \ FROM ubuntu:18.04 as builder -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; +RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; RUN apt-get update \ && apt-get install -y --no-install-recommends curl ca-certificates gnupg patch # nodejs -RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \ +RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y nodejs # yarn diff --git a/Dockerfile.j2 b/Dockerfile.j2 index cc02642..fde152f 100644 --- a/Dockerfile.j2 +++ b/Dockerfile.j2 @@ -13,7 +13,7 @@ FROM arm32v7/{{image}} as system COPY --from=amd64 /usr/bin/qemu-arm-static /usr/bin/ {%endif%} -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; +RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; # built-in packages ENV DEBIAN_FRONTEND noninteractive @@ -51,7 +51,7 @@ RUN apt update \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* -{%endif%} +{%endif%} {%if desktop == "lxqt" %} RUN apt update \ && apt install -y --no-install-recommends --allow-unauthenticated \ @@ -59,7 +59,7 @@ RUN apt update \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* -{%endif%} +{%endif%} {%if desktop == "xfce4" %} RUN apt update \ && apt install -y --no-install-recommends --allow-unauthenticated \ @@ -67,7 +67,7 @@ RUN apt update \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* -{%endif%} +{%endif%} # Additional packages require ~600MB # libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw @@ -105,14 +105,14 @@ RUN apt-get update \ FROM {{image}} as builder {% if localbuild == 1 %} -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; +RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; {% endif %} RUN apt-get update \ && apt-get install -y --no-install-recommends curl ca-certificates gnupg patch # nodejs -RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \ +RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y nodejs # yarn