Skip to content
This repository was archived by the owner on Aug 30, 2025. It is now read-only.

Commit 4ab6e21

Browse files
Fix entrypoint
Turns out I wasn't that far off.
1 parent 985cca7 commit 4ab6e21

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

naev-macos/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ FROM registry.fedoraproject.org/fedora-minimal:latest
7171
WORKDIR /
7272
COPY --from=build /usr/lib/osxcross /usr/lib/osxcross
7373
COPY --from=build /usr/local/bin/dmg /usr/bin
74-
# Copy Entrypoint
7574
COPY macports-configure.sh /usr/bin
7675

7776
LABEL org.opencontainers.image.authors "Naev Dev Team"
@@ -111,3 +110,6 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettex
111110
# Set WORKDIR when you spin up the image.
112111
mkdir -p /tmp/naevBuild
113112
WORKDIR /tmp/naevBuild
113+
114+
ENTRYPOINT [ "/usr/bin/macports-configure.sh" ]
115+
CMD [ "/bin/bash" ]

naev-macos/macports-configure.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/bin/sh
22

33
# Set HOST and MACOSX_DEPLOYMENT_TARGET depending on which BUILD_ARCH is selected.
44
# Also configure the macports directory for the right libraries since we build for two different targets.
@@ -22,3 +22,5 @@ else
2222
rm -f /usr/lib/osxcross/macports
2323
ln -s /usr/lib/osxcross/macports.x86_64 /usr/lib/osxcross/macports
2424
fi
25+
26+
exec "$@"

0 commit comments

Comments
 (0)