From d882281f1e1bae1149f69c42ed7599aeb2596d1c Mon Sep 17 00:00:00 2001 From: Vijay A Date: Mon, 24 May 2021 14:14:35 +0530 Subject: Use electronuserland base image so that we don't need to manually track all system deps (node, etc). --- CONTRIBUTING.md | 4 +++- Dockerfile | 8 +------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df9626695..967089112 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -68,10 +68,12 @@ v8.0.0 The version [2.23.0](https://github.com/git-for-windows/git/releases/tag/v2.23.0.windows.1) for Git is working fine for development. You can then use the console from Git to do the development procedure. +_Note:_ This list can likely get outdated. If so, please refer to the specific version of the [electronuserland builder](https://hub.docker.com/r/electronuserland/builder) that we use in our [Dockerfile](./Dockerfile). + #### Debian/Ubuntu ```bash -apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev rpm +apt install ca-certificates curl netbase wget tzdata rpm ``` #### Fedora diff --git a/Dockerfile b/Dockerfile index 7c25776e4..4f772c0da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,4 @@ -FROM node:14 as builder - -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends libx11-dev libxext-dev libxss-dev libxkbfile-dev rpm \ - && apt-get autoremove -y \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* +FROM electronuserland/builder:14 as builder WORKDIR /usr/src/ferdi -- cgit v1.2.3-54-g00ecf