From 3b04881a042bbf1aeb62d6eafddfd756a02532c9 Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Mon, 14 Dec 2020 11:50:20 -0800 Subject: [PATCH] Update docker file for Arch Linux and OpenSUSE Change-Id: Ia573a6ff84ff9a9789061813ef47137b086bd597 --- docs/source/build_instructions.md | 4 ++-- packager/testing/dockers/ArchLinux_Dockerfile | 4 ++-- packager/testing/dockers/OpenSUSE_Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/build_instructions.md b/docs/source/build_instructions.md index ccb77dad52..66bf35ac1d 100644 --- a/docs/source/build_instructions.md +++ b/docs/source/build_instructions.md @@ -267,7 +267,7 @@ export GYP_DEFINES='clang=0 use_experimental_allocator_shim=0 use_allocator=none Instead of running `sudo apt-get install` to install build dependencies, run: ```shell -$ sudo pacman -S --needed python2 git curl gcc gcc-libs make +$ sudo pacman -Sy --needed python2 git curl gcc gcc-libs make $ sudo ln -sf python2 /usr/bin/python ``` @@ -305,7 +305,7 @@ $ su -c 'yum install -y git python git curl gcc-c++ findutils bzip2 \ Use `zypper` command to install dependencies: ```shell -sudo zypper in git python python-xml git curl gcc-c++ tar +sudo zypper in git python python-xml git curl gcc-c++ tar libncurses5 ``` ## Tips, tricks, and troubleshooting diff --git a/packager/testing/dockers/ArchLinux_Dockerfile b/packager/testing/dockers/ArchLinux_Dockerfile index 5bb8fe4481..c4a160f206 100644 --- a/packager/testing/dockers/ArchLinux_Dockerfile +++ b/packager/testing/dockers/ArchLinux_Dockerfile @@ -1,7 +1,7 @@ -FROM pritunl/archlinux:2018-08-11 +FROM archlinux:20200908 # Update, and install basic packages. -RUN pacman -S --needed --noconfirm python2 git curl gcc gcc-libs make +RUN pacman -Sy --needed --noconfirm python2 git curl gcc gcc-libs make # depot_tools uses python2 instead of python3. RUN ln -sf python2 /usr/bin/python diff --git a/packager/testing/dockers/OpenSUSE_Dockerfile b/packager/testing/dockers/OpenSUSE_Dockerfile index af4767a516..3987235915 100644 --- a/packager/testing/dockers/OpenSUSE_Dockerfile +++ b/packager/testing/dockers/OpenSUSE_Dockerfile @@ -1,7 +1,7 @@ -FROM opensuse:42.3 +FROM opensuse/leap:15 # Update, and install basic packages. -RUN zypper in -y git python python-xml git curl gcc-c++ tar +RUN zypper in -y git python python-xml git curl gcc-c++ tar libncurses5 # Install depot_tools. WORKDIR /