Skip to content

Commit 747a6ff

Browse files
committed
Fix Docker builds for newer version of Docker
1 parent 5615be4 commit 747a6ff

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Plugins/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ all-windows-llvm-mingw: windows-mingw-x86_64 windows-mingw-x86 windows-mingw-arm
130130

131131
# Dockerized builds
132132
docker-all-android:
133-
docker build -f tools~/Dockerfile.build.android -t gilzoide-sqlite-net-build-android:latest .
133+
docker build -f tools~/Dockerfile.build.android --platform=linux/amd64 -t gilzoide-sqlite-net-build-android:latest .
134134
docker run --rm -v "$(CURDIR)":/src -w /src --platform=linux/amd64 gilzoide-sqlite-net-build-android:latest make all-android
135135
docker-all-linux:
136-
docker build -f tools~/Dockerfile.build.linux -t gilzoide-sqlite-net-build-linux:latest .
136+
docker build -f tools~/Dockerfile.build.linux --platform=linux/amd64 -t gilzoide-sqlite-net-build-linux:latest .
137137
docker run --rm -v "$(CURDIR)":/src -w /src --platform=linux/amd64 gilzoide-sqlite-net-build-linux:latest make all-linux
138138
docker-all-webgl:
139139
docker build -f tools~/Dockerfile.build.webgl -t gilzoide-sqlite-net-build-webgl:latest .

Plugins/tools~/Dockerfile.build.android

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM --platform=linux/amd64 debian:12-slim
2+
FROM debian:12-slim
33

44
ARG NDK_VERSION=r26c
55

@@ -12,4 +12,4 @@ RUN curl -SLO http://dl.google.com/android/repository/android-ndk-$NDK_VERSION-l
1212
RUN unzip android-ndk-$NDK_VERSION-linux.zip
1313
RUN mv ./android-ndk-$NDK_VERSION /opt/ndk
1414
RUN rm android-ndk-$NDK_VERSION-linux.zip
15-
ENV ANDROID_NDK_ROOT /opt/ndk
15+
ENV ANDROID_NDK_ROOT=/opt/ndk
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax=docker/dockerfile:1
2-
FROM --platform=linux/amd64 debian:12-slim
2+
FROM debian:12-slim
33

44
RUN apt-get -qq update \
55
&& apt-get -qq install -y --no-install-recommends \
66
gcc \
77
libc-dev \
8-
make
8+
make

0 commit comments

Comments
 (0)