Skip to content

Commit dd75f4a

Browse files
committed
chore: update joseluisq/docker-osxcross to 1.0.0-beta.2
1 parent cb84e4c commit dd75f4a

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

docker/amd64/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM joseluisq/docker-osxcross:1.0.0-beta.1
1+
FROM joseluisq/docker-osxcross:1.0.0-beta.2
22

33
ARG VERSION=0.0.0
44
ENV VERSION=${VERSION}
@@ -199,8 +199,18 @@ RUN set -eux \
199199
-lssl -lcrypto \
200200
&& true
201201

202+
RUN set -eux \
203+
&& echo "Removing temp files..." \
204+
&& rm -rf *~ taballs *.tar.xz \
205+
&& rm -rf /tmp/* \
206+
&& true
207+
202208
WORKDIR /root
203209

210+
# pkg-config related environment variables
211+
ENV PKG_CONFIG_ALLOW_CROSS=true \
212+
PKG_CONFIG_ALL_STATIC=true
213+
204214
# OpenSSL related environment variables
205215
ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_STATIC=1
206216
ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/x86_64-linux-musl
@@ -209,16 +219,6 @@ ENV AARCH64_UNKNOWN_LINUX_MUSL_OPENSSL_STATIC=1
209219
ENV AARCH64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/aarch64-linux-gnu
210220
ENV AARCH64_APPLE_DARWIN_OPENSSL_DIR=/usr/local/aarch64-apple-darwin
211221

212-
# pkg-config related environment variables
213-
ENV PKG_CONFIG_ALLOW_CROSS=true \
214-
PKG_CONFIG_ALL_STATIC=true
215-
216-
RUN set -eux \
217-
&& echo "Removing temp files..." \
218-
&& rm -rf *~ taballs *.tar.xz \
219-
&& rm -rf /tmp/* \
220-
&& true
221-
222222
WORKDIR /root/src
223223

224224
CMD ["bash"]

docker/arm64/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM joseluisq/docker-osxcross:1.0.0-beta.1
1+
FROM joseluisq/docker-osxcross:1.0.0-beta.2
22

33
ARG VERSION=0.0.0
44
ENV VERSION=${VERSION}
@@ -199,8 +199,18 @@ RUN set -eux \
199199
-lssl -lcrypto \
200200
&& true
201201

202+
RUN set -eux \
203+
&& echo "Removing temp files..." \
204+
&& rm -rf *~ taballs *.tar.xz \
205+
&& rm -rf /tmp/* \
206+
&& true
207+
202208
WORKDIR /root
203209

210+
# pkg-config related environment variables
211+
ENV PKG_CONFIG_ALLOW_CROSS=true \
212+
PKG_CONFIG_ALL_STATIC=true
213+
204214
# OpenSSL related environment variables
205215
ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_STATIC=1
206216
ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/x86_64-linux-musl
@@ -209,16 +219,6 @@ ENV AARCH64_UNKNOWN_LINUX_MUSL_OPENSSL_STATIC=1
209219
ENV AARCH64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/aarch64-linux-gnu
210220
ENV AARCH64_APPLE_DARWIN_OPENSSL_DIR=/usr/local/aarch64-apple-darwin
211221

212-
# pkg-config related environment variables
213-
ENV PKG_CONFIG_ALLOW_CROSS=true \
214-
PKG_CONFIG_ALL_STATIC=true
215-
216-
RUN set -eux \
217-
&& echo "Removing temp files..." \
218-
&& rm -rf *~ taballs *.tar.xz \
219-
&& rm -rf /tmp/* \
220-
&& true
221-
222222
WORKDIR /root/src
223223

224224
CMD ["bash"]

0 commit comments

Comments
 (0)