Skip to content
Snippets Groups Projects
Commit abb5181e authored by cyberta's avatar cyberta
Browse files

set GOBIN environment variable and fix ANDROID_NDK_HOME

parent c03a2997
Branches
No related tags found
1 merge request!295Golang docker tweaks
......@@ -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 - && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment