Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask_android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
leap
bitmask_android
Commits
abb5181e
Commit
abb5181e
authored
10 months ago
by
cyberta
Browse files
Options
Downloads
Patches
Plain Diff
set GOBIN environment variable and fix ANDROID_NDK_HOME
parent
c03a2997
Branches
Branches containing commit
No related tags found
1 merge request
!295
Golang docker tweaks
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
docker/android-ndk/Dockerfile
+7
-6
7 additions, 6 deletions
docker/android-ndk/Dockerfile
with
7 additions
and
6 deletions
docker/android-ndk/Dockerfile
+
7
−
6
View file @
abb5181e
...
...
@@ -33,7 +33,7 @@ RUN apt-get update -qq && \
# --- Install Android NDK (for running C code)
ENV
ANDROID_NDK_VERSION "r21e"
ENV
ANDROID_NDK_
HOME ${ANDROID_HOME}/android-ndk-${ANDROID_NDK_VERSION}
ENV
ANDROID_NDK_
VERSION_NUMBER "21.4.7075529"
ENV
ANDROID_NDK_URL http://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip
ENV
ANDROID_SDK_ROOT ${ANDROID_HOME}/latest/cmdline-tools
...
...
@@ -43,10 +43,10 @@ RUN java --version
RUN
curl
-L
$ANDROID_NDK_URL
-o
ndk.zip
\
&&
unzip ndk.zip
-d
$ANDROID_HOME
/ndk
\
&&
rm
-rf
ndk.zip
RUN
cat
$ANDROID_HOME
/ndk/android-ndk-
${
ANDROID_NDK_VERSION
}
/
source.properties |
\
grep
Pkg.Revision |
cut
-d
"="
-f
2 |
\
xargs
-I
'{}'
mv
$
ANDROID_HOME
/ndk/
android-ndk-
${
ANDROID_NDK_VERSION
}
/
$ANDROID_HOME
/ndk/
'{}'
&&
rm
-rf
ndk.zip
\
&&
mv
$ANDROID_HOME
/ndk/android-ndk-
${
ANDROID_NDK_VERSION
}
/
$ANDROID_HOME
/ndk/
$ANDROID_NDK_VERSION_NUMBER
ENV
ANDROID_NDK_HOME ${
ANDROID_HOME
}
/ndk/
$
ANDROID_NDK_VERSION
_NUMBER
ENV
PATH ${PATH}:${ANDROID_NDK_HOME}
RUN
echo
"accept all licenses"
...
...
@@ -62,7 +62,8 @@ ENV GO_VERSION=go1.22.2.linux-amd64
ENV
EXPECTED_FP=5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17
ENV
GO_DOWNLOAD_URL=https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz
ENV
GOROOT=/usr/local/go
ENV
PATH=$GOROOT/bin:$PATH
ENV
GOBIN=/usr/local/go/bin
ENV
PATH=$GOBIN:$PATH
RUN
curl
-L
-o
"go.tar.gz"
"https://golang.org/dl/
${
GO_VERSION
}
.tar.gz"
;
\
echo
"
${
EXPECTED_FP
}
go.tar.gz"
|
sha256sum
-c
-
&&
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment