Skip to content

Commit c0a68b3

Browse files
author
MhdRahman
committed
Fixed Docker on Docker issue
1 parent 0a8c501 commit c0a68b3

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ jobs:
128128
# Set environment variables for cross-compilation
129129
echo "PROTOC=/usr/local/bin/protoc" >> $GITHUB_ENV
130130
echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
131-
echo "CROSS_CONTAINER_IN_CONTAINER=true" >> $GITHUB_ENV
132131
133132
- name: Build embedded only
134133
if: matrix.embedded_only == true
@@ -139,7 +138,6 @@ jobs:
139138
env:
140139
PROTOC: /usr/local/bin/protoc
141140
PKG_CONFIG_ALLOW_CROSS: 1
142-
CROSS_CONTAINER_IN_CONTAINER: true
143141
run: cross build --release --target ${{ matrix.target }}
144142

145143
- name: Build with cargo

Cross.toml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,23 @@
22
passthrough = [
33
"PROTOC",
44
"PKG_CONFIG_ALLOW_CROSS",
5-
"PKG_CONFIG_PATH",
65
]
76

8-
[target.armv7-linux-androideabi]
7+
[target.aarch64-unknown-linux-gnu]
98
pre-build = [
10-
"dpkg --add-architecture armhf",
119
"apt-get update",
1210
"apt-get install -y protobuf-compiler",
1311
]
1412

13+
[target.armv7-linux-androideabi]
14+
pre-build = [
15+
"apt-get update",
16+
"apt-get install -y protobuf-compiler",
17+
]
18+
1519
[target.armv7-unknown-linux-gnueabihf]
1620
pre-build = [
17-
"dpkg --add-architecture armhf",
21+
"dpkg --add-architecture armhf",
1822
"apt-get update",
1923
"apt-get install -y protobuf-compiler",
2024
"apt-get install -y libdbus-1-dev:armhf pkg-config",

0 commit comments

Comments
 (0)