Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update docker file for Arch Linux and OpenSUSE 

Change-Id: Ia573a6ff84ff9a9789061813ef47137b086bd597
This commit is contained in:
KongQun Yang 2020-12-14 11:50:20 -08:00
parent 7f9fa8de9a
commit 3b04881a04
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/build_instructions.md
View File

@ -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: Instead of running `sudo apt-get install` to install build dependencies, run:
```shell ```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 $ 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: Use `zypper` command to install dependencies:
```shell ```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 ## Tips, tricks, and troubleshooting

4
packager/testing/dockers/ArchLinux_Dockerfile
View File

@ -1,7 +1,7 @@
FROM pritunl/archlinux:2018-08-11 FROM archlinux:20200908
# Update, and install basic packages. # 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. # depot_tools uses python2 instead of python3.
RUN ln -sf python2 /usr/bin/python RUN ln -sf python2 /usr/bin/python

4
packager/testing/dockers/OpenSUSE_Dockerfile
View File

@ -1,7 +1,7 @@
FROM opensuse:42.3 FROM opensuse/leap:15
# Update, and install basic packages. # 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. # Install depot_tools.
WORKDIR / WORKDIR /