File tree Expand file tree Collapse file tree 5 files changed +8
-15
lines changed Expand file tree Collapse file tree 5 files changed +8
-15
lines changed Original file line number Diff line number Diff line change @@ -23,12 +23,12 @@ COPY --from=android /opt/android-sdk /opt/android-sdk
23
23
ADD scripts/docker_install.sh /tmp/
24
24
RUN /tmp/docker_install.sh
25
25
26
- ENV GOPATH /opt/go
27
- ENV GOROOT /opt/go_dist /go
28
- ENV PATH $GOROOT /bin:$GOPATH /bin:$PATH
26
+ # In this path executables will be installed during docker build
27
+ ARG SYS_GOPATH /opt/go
28
+ ENV PATH $SYS_GOPATH /bin:/usr/local/go /bin:$PATH
29
29
30
30
ADD Makefile /tmp/
31
- RUN make -C /tmp/ envinit
31
+ RUN GOPATH=$SYS_GOPATH make -C /tmp/ envinit
32
32
33
33
ENV PATH /opt/qt6/6.8.2/gcc_64/bin:/opt/qt6/6.8.2/gcc_64/libexec:$PATH
34
34
Original file line number Diff line number Diff line change 14
14
15
15
SHELL := /bin/bash
16
16
WEBROOT := frontends/web
17
- GOPATH ?= $(HOME ) /go
18
- PATH := $(PATH ) :$(GOPATH ) /bin
19
17
20
18
catch :
21
19
@echo " Choose a make target."
Original file line number Diff line number Diff line change 1
1
export ANDROID_SDK_ROOT := /opt/android-sdk
2
2
export ANDROID_NDK_HOME := /opt/android-sdk/ndk/21.2.6472646
3
- # gomodcache location for gomobile build pkgs. Set to tmp folder, because writing access is needed.
4
- export GOMODCACHE_ROOT := /tmp/gomodcache/pkg/mod
Original file line number Diff line number Diff line change 1
1
include ../../android-env.mk.inc
2
2
3
- # GOMODCACHE to /tmp directory, because gomobile needs to write pkgs.
4
- # Also set -glflags to fix the vendor issue with gomobile, see: https://github.com/golang/go/issues/67927#issuecomment-2241523694
3
+ # Set -glflags to fix the vendor issue with gomobile, see: https://github.com/golang/go/issues/67927#issuecomment-2241523694
5
4
build-android :
6
- GOMODCACHE= ${GOMODCACHE_ROOT} ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -glflags=" -mod=readonly" -ldflags=" -s -w" -target android .
5
+ ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -glflags=" -mod=readonly" -ldflags=" -s -w" -target android .
7
6
build-ios :
8
- GOMODCACHE= ${GOMODCACHE_ROOT} gomobile bind -x -a -glflags=" -mod=readonly" -ldflags=" -s -w" -target ios,iossimulator .
7
+ gomobile bind -x -a -glflags=" -mod=readonly" -ldflags=" -s -w" -target ios,iossimulator .
9
8
clean :
10
9
rm -f mobileserver.aar mobileserver-sources.jar
Original file line number Diff line number Diff line change 13
13
# See the License for the specific language governing permissions and
14
14
# limitations under the License.
15
15
16
-
17
16
apt-get update
18
17
apt-get install -y --no-install-recommends curl ca-certificates
19
18
@@ -83,8 +82,7 @@ aqt install-qt linux desktop 6.8.2 -m qtpositioning qtserialport qtwebchannel qt
83
82
npm install -g npm@10
84
83
npm install -g locize-cli
85
84
86
- mkdir -p /opt/go_dist
87
- curl https://dl.google.com/go/go1.22.5.linux-amd64.tar.gz | tar -xz -C /opt/go_dist
85
+ curl https://dl.google.com/go/go1.22.5.linux-amd64.tar.gz | tar -xz -C /usr/local
88
86
89
87
# fuse is needed to run the linuxdeployqt appimage.
90
88
apt-get install -y --no-install-recommends fuse
You can’t perform that action at this time.
0 commit comments