Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.2

FROM alpine:3.15.4 AS base
FROM alpine:3.23.0 AS base

FROM base AS build
RUN apk update && apk add alpine-sdk sudo
Expand All @@ -12,10 +12,6 @@ USER nsbuild
RUN mkdir -p /nsbuild/src/main /nsbuild/packages/main && \
abuild-keygen -ain

FROM build AS build-wine
COPY --chown=nsbuild:nsbuild ./wine/ /nsbuild/src/main/wine/
RUN ulimit -n 1024; cd /nsbuild/src/main/wine && abuild -r

FROM build AS build-northstar
COPY --chown=nsbuild:nsbuild ./northstar/ /nsbuild/src/main/northstar/
RUN ulimit -n 1024; cd /nsbuild/src/main/northstar && abuild -r
Expand All @@ -29,9 +25,7 @@ COPY --chown=nsbuild:nsbuild ./entrypoint/ /nsbuild/src/main/entrypoint/
RUN ulimit -n 1024; cd /nsbuild/src/main/entrypoint && abuild -r

FROM base
RUN apk add --no-cache gnutls tzdata ca-certificates sudo
RUN --mount=from=build-wine,source=/nsbuild/packages/main/x86_64,target=/nsbuild/wine \
apk add --no-cache --allow-untrusted /nsbuild/wine/northstar-dedicated-wine-[0-9]*-r*.apk xvfb
RUN apk add --no-cache wine gnutls tzdata ca-certificates sudo xvfb
RUN --mount=from=build-northstar,source=/nsbuild/packages/main/x86_64,target=/nsbuild/northstar \
apk add --no-cache --allow-untrusted /nsbuild/northstar/*.apk
RUN --mount=from=build-nswrap,source=/nsbuild/packages/main/x86_64,target=/nsbuild/nswrap \
Expand Down
20 changes: 0 additions & 20 deletions src/nswrap/nswrap.c
Original file line number Diff line number Diff line change
Expand Up @@ -903,26 +903,6 @@ int main(int argc, char **argv) {
return 1;
}

// init setproctitle and attempt to ensure there is a placeholder arg consisting of spaces
for (const char *x = argv[argc - 1]; *x; x++) {
if (*x != ' ') {
char **nargv = alloca(argc + 2*sizeof(char*));
for (int i = 0; i < argc; i++) {
nargv[i] = argv[i];
}
nargv[argc] = " ";
nargv[argc+1] = NULL;
if (execve("/proc/self/exe", nargv, environ) == -1) {
ns_perror("warning: self-exec with additional space in argv for process title failed: execve");
argc++;
}
break;
}
}
argc--;
setproctitle(argv, NULL);
argv[argc] = NULL;

if (chdir(argv[1])) {
ns_perror("error: chdir '%s'", argv[1]);
return 1;
Expand Down
307 changes: 0 additions & 307 deletions src/wine/APKBUILD

This file was deleted.

31 changes: 0 additions & 31 deletions src/wine/createwindow.patch

This file was deleted.

57 changes: 0 additions & 57 deletions src/wine/rpath.patch

This file was deleted.

Loading