diff options
author | Vijay A <avijayr@protonmail.com> | 2021-05-24 14:14:35 +0530 |
---|---|---|
committer | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-05-27 15:32:08 +0530 |
commit | d882281f1e1bae1149f69c42ed7599aeb2596d1c (patch) | |
tree | cea8346b3e7d651bfb6bb5773c488ae7a3da1795 | |
parent | Add installation via winget-cli to README.md (diff) | |
download | ferdium-app-d882281f1e1bae1149f69c42ed7599aeb2596d1c.tar.gz ferdium-app-d882281f1e1bae1149f69c42ed7599aeb2596d1c.tar.zst ferdium-app-d882281f1e1bae1149f69c42ed7599aeb2596d1c.zip |
Use electronuserland base image so that we don't need to manually track all system deps (node, etc).
-rw-r--r-- | CONTRIBUTING.md | 4 | ||||
-rw-r--r-- | 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 | |||
68 | 68 | ||
69 | 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. | 69 | 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. |
70 | 70 | ||
71 | _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). | ||
72 | |||
71 | #### Debian/Ubuntu | 73 | #### Debian/Ubuntu |
72 | 74 | ||
73 | ```bash | 75 | ```bash |
74 | apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev rpm | 76 | apt install ca-certificates curl netbase wget tzdata rpm |
75 | ``` | 77 | ``` |
76 | 78 | ||
77 | #### Fedora | 79 | #### Fedora |
diff --git a/Dockerfile b/Dockerfile index 7c25776e4..4f772c0da 100644 --- a/Dockerfile +++ b/Dockerfile | |||
@@ -1,10 +1,4 @@ | |||
1 | FROM node:14 as builder | 1 | FROM electronuserland/builder:14 as builder |
2 | |||
3 | RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ | ||
4 | && apt-get -y install --no-install-recommends libx11-dev libxext-dev libxss-dev libxkbfile-dev rpm \ | ||
5 | && apt-get autoremove -y \ | ||
6 | && apt-get clean -y \ | ||
7 | && rm -rf /var/lib/apt/lists/* | ||
8 | 2 | ||
9 | WORKDIR /usr/src/ferdi | 3 | WORKDIR /usr/src/ferdi |
10 | 4 | ||