Skip to content

Commit

Permalink
Fix entrypoint
Browse files Browse the repository at this point in the history
Turns out I wasn't that far off.
  • Loading branch information
ProjectSynchro committed Jan 5, 2024
1 parent 985cca7 commit 4ab6e21
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion naev-macos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ FROM registry.fedoraproject.org/fedora-minimal:latest
WORKDIR /
COPY --from=build /usr/lib/osxcross /usr/lib/osxcross
COPY --from=build /usr/local/bin/dmg /usr/bin
# Copy Entrypoint
COPY macports-configure.sh /usr/bin

LABEL org.opencontainers.image.authors "Naev Dev Team"
Expand Down Expand Up @@ -111,3 +110,6 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettex
# Set WORKDIR when you spin up the image.
mkdir -p /tmp/naevBuild
WORKDIR /tmp/naevBuild

ENTRYPOINT [ "/usr/bin/macports-configure.sh" ]
CMD [ "/bin/bash" ]
4 changes: 3 additions & 1 deletion naev-macos/macports-configure.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# Set HOST and MACOSX_DEPLOYMENT_TARGET depending on which BUILD_ARCH is selected.
# Also configure the macports directory for the right libraries since we build for two different targets.
Expand All @@ -22,3 +22,5 @@ else
rm -f /usr/lib/osxcross/macports
ln -s /usr/lib/osxcross/macports.x86_64 /usr/lib/osxcross/macports
fi

exec "$@"

0 comments on commit 4ab6e21

Please sign in to comment.