diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2024-12-18 11:18:48 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2024-12-18 11:18:48 +0100 |
| commit | 124ce3fef2aecbae87648fc2000beb9afa500d5a (patch) | |
| tree | 178f2ee6ef6f1352d8ae5c839d0cf79449ac1344 | |
| parent | c6bdff016666d469feb18ff595e8dcd26398e277 (diff) | |
| parent | 35424186a5e1efb30e06d1785e26868497165f3d (diff) | |
| download | mullvadvpn-124ce3fef2aecbae87648fc2000beb9afa500d5a.tar.xz mullvadvpn-124ce3fef2aecbae87648fc2000beb9afa500d5a.zip | |
Merge branch 'add-libarchive-tools-to-container'
| -rw-r--r-- | .dockerignore | 2 | ||||
| -rw-r--r-- | building/Dockerfile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.dockerignore b/.dockerignore index 2e2b5de53b..4a017f1139 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,2 @@ **/* -!gui/package.json +!desktop/package.json diff --git a/building/Dockerfile b/building/Dockerfile index 5fd58233c9..07018b6cd9 100644 --- a/building/Dockerfile +++ b/building/Dockerfile @@ -48,6 +48,8 @@ RUN dpkg --add-architecture arm64 && apt-get update -y && apt-get install -y \ rpm \ # For cross-compiling/linting towards Windows gcc-mingw-w64-x86-64 \ + # For building Arch Linux packages + libarchive-tools \ && rm -rf /var/lib/apt/lists/* # === Rust === @@ -101,7 +103,7 @@ RUN apt-get update -y && \ ENV PATH=/root/.volta/bin:$PATH # volta seemingly does not have a way to explicitly install the toolchain # versions from package.json, but `node --version` triggers an install -COPY desktop/packages/mullvad-vpn/package.json . +COPY desktop/package.json . RUN curl https://get.volta.sh | bash && node --version && rm package.json # === Golang === |