feat: build darwin amd64/arm64 Docker images #200
Merged
+70
−27
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kuisathaverat
added
enhancement
|
This pull request does not have a backport label. Could you fix it @kuisathaverat? 🙏
|
kuisathaverat
commented
May 13, 2022
| @@ -34,7 +34,7 @@ RUN tar -xzf /tmp/osxcross.tar.gz -C / \ | |||
|
|
|||
| ENV PATH $PATH:$OSXCROSS_PATH/bin | |||
| # Add osxcross libraries to the library PATH | |||
| ENV LD_LIBRARY_PATH ${OSXCROSS_PATH}/lib:$LD_LIBRARY_PATH | |||
| ENV LD_LIBRARY_PATH $OSXCROSS_PATH/lib:/lib:/usr/lib:/usr/local/lib:$LD_LIBRARY_PATH | |||
There was a problem hiding this comment.
force the whole LD_LIBRARY_PATH
kuisathaverat
commented
May 13, 2022
| @@ -51,23 +51,35 @@ RUN \ | |||
|
|
|||
| ENV PATH $PATH:$OSXCROSS_PATH/bin | |||
| # Add osxcross libraries to the library PATH | |||
| ENV LD_LIBRARY_PATH ${OSXCROSS_PATH}/lib:$LD_LIBRARY_PATH | |||
| ENV LD_LIBRARY_PATH $OSXCROSS_PATH/lib:/lib:/usr/lib:/usr/local/lib:$LD_LIBRARY_PATH | |||
There was a problem hiding this comment.
force the whole LD_LIBRARY_PATH
kuisathaverat
commented
May 13, 2022
Comment on lines
+60
to
83
| && o64-clang helloWorld.c -o helloWorld.x86_64 \ | ||
| && file helloWorld.x86_64 \ | ||
| && file helloWorld.x86_64 | grep -c 'Mach-O 64-bit x86_64' | ||
|
|
||
| {{- if or (eq .DEBIAN_VERSION "10") (eq .DEBIAN_VERSION "11")}} | ||
| RUN cd / \ | ||
| && oa64-clang helloWorld.c -o helloWorld.arm64 \ | ||
| && file helloWorld.arm64 \ | ||
| && file helloWorld.arm64 | grep -c 'Mach-O 64-bit arm64' | ||
|
|
||
| RUN cd / \ | ||
| && lipo -create -output helloWorld.universal helloWorld.x86_64 helloWorld.arm64 \ | ||
| && file helloWorld.universal | grep 'Mach-O universal binary' \ | ||
| && rm helloWorld.* | ||
| {{- end }} | ||
|
|
||
| # MacOSX10.14 SDK does not have 32bits compiler | ||
| {{- if and (ne .DEBIAN_VERSION "10") (ne .DEBIAN_VERSION "11")}} | ||
| RUN cd / \ | ||
| && o32-clang helloWorld.c -o helloWorld \ | ||
| && file helloWorld \ | ||
| && file helloWorld | grep -c 'Mach-O i386' \ | ||
| && rm helloWorld.c helloWorld | ||
| && o32-clang helloWorld.c -o helloWorld.i368 \ | ||
| && file helloWorld.i368 \ | ||
| && file helloWorld.i368 | grep -c 'Mach-O i386' \ | ||
| && rm helloWorld.* | ||
| {{- end }} |
There was a problem hiding this comment.
refactor tests
💚 Build Succeeded
Expand to view the summary
Build stats
🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
v1v
approved these changes
May 16, 2022
kuisathaverat
commented
May 16, 2022
kuisathaverat
commented
May 16, 2022
|
/test |
|
@Mergifyio backport 1.17 |
mergify bot
pushed a commit
that referenced
this pull request
May 31, 2022
* feat: buid darwing amd64/arm64 Docker images * Update go/darwin-arm64/Makefile * Update go/darwin/Makefile * fix: typo * feat: build multiarch Docker image * fix: use production Docker images * fix: typo * fix: copy changes to darwinw-arm64 * fix: remove arg (cherry picked from commit 831fe5e) # Conflicts: # go/darwin-arm64/Dockerfile.tmpl # go/darwin/Dockerfile.tmpl
✅ Backports have been created
|
kuisathaverat
added a commit
that referenced
this pull request
Jun 1, 2022
* feat: build darwin amd64/arm64 Docker images (#200) * feat: buid darwing amd64/arm64 Docker images * Update go/darwin-arm64/Makefile * Update go/darwin/Makefile * fix: typo * feat: build multiarch Docker image * fix: use production Docker images * fix: typo * fix: copy changes to darwinw-arm64 * fix: remove arg (cherry picked from commit 831fe5e) # Conflicts: # go/darwin-arm64/Dockerfile.tmpl # go/darwin/Dockerfile.tmpl * fix: resolve conflits * fix: add xz-utils * fix: duplicate code Co-authored-by: Ivan Fernandez Calvo <[email protected]> Co-authored-by: Ivan Fernandez Calvo <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
build darwin amd64/arm64 Docker images
depends on #197
related to #153