-
Notifications
You must be signed in to change notification settings - Fork 5.9k
[do not merge] Prepare code-server for ARM distribution #1042
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d27617c
[doc/quickstart] use version from GH-379
sr229 93a0c72
Merge branch 'master' of github.com:cdr/code-server
ac6eb0d
[ci] make docker-exec compensate for ARM containers now
2907677
[ci] prepare CI script for ARM targets
f8d9f2e
[ci] add codercom/nbin-alpine to the APK command
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,20 +9,27 @@ function docker-build() { | |
local minify="${MINIFY:-}" | ||
if [[ "${target}" == "linux" ]] ; then | ||
image="codercom/nbin-centos" | ||
fi | ||
fi | ||
|
||
local containerId | ||
containerId=$(docker create --network=host --rm -it -v "$(pwd)"/.cache:/src/.cache "${image}") | ||
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes | ||
docker start "${containerId}" | ||
docker exec "${containerId}" mkdir -p /src | ||
|
||
# TODO: temporary as long as we are rebuilding modules. | ||
if [[ "${image}" == "codercom/nbin-alpine" ]] ; then | ||
docker exec "${containerId}" apk add libxkbfile-dev libsecret-dev | ||
else | ||
# TODO: at some point git existed but it seems to have disappeared. | ||
docker exec "${containerId}" yum install -y libxkbfile-devel libsecret-devel git | ||
fi | ||
|
||
case "${image}" in | ||
codercom/nbin-alpine-arm | codercom/nbin-apline-arm64 | codercom/nbin-alpine) | ||
docker exec "${containerId}" apk add libxkbfile-dev libsecret-dev git | ||
;; | ||
codercom/nbin-arm | codercom-nbin-arm64) | ||
docker exec "${containerId}" apt -y install libxkbfile-dev libsecret-dev git | ||
;; | ||
*) | ||
# Assume anything else is CentOS/Fedora/RHEL | ||
docker exec "${containerId}" yum install -y libxkbfile-devel libsecret-devel git | ||
;; | ||
esac | ||
|
||
function docker-exec() { | ||
local command="${1}" ; shift | ||
|
@@ -34,6 +41,8 @@ function docker-build() { | |
docker cp ./. "${containerId}":/src | ||
docker-exec build | ||
if [[ -n "${package}" ]] ; then | ||
#FIXME: Packages is not being preloaded in-container. | ||
docker exec "${containerId}" bash -c "cd /src && yarn" | ||
docker-exec binary | ||
docker-exec package | ||
mkdir -p release | ||
|
@@ -52,6 +61,8 @@ function local-build() { | |
|
||
local-exec build | ||
if [[ -n "${package}" ]] ; then | ||
# FIXME: initialize node_modules as always | ||
yarn | ||
local-exec binary | ||
local-exec package | ||
fi | ||
|
@@ -81,4 +92,4 @@ function main() { | |
fi | ||
} | ||
|
||
main "$@" | ||
main "$@" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing new line |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Useless whitespace