Skip to content

Commit f6aaedb

Browse files
committed
update mingw image native/cgo
1 parent 908b71b commit f6aaedb

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

mingw-cross-cgo/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG CONTAINER_REGISTRY_PREFIX
2-
ARG TOOLCHAIN_IMAGE_VERSION="91c0455fb1f6035ff116deea896e8888c776b754"
2+
ARG TOOLCHAIN_IMAGE_VERSION="908b71b2c95c01591ed1093f98bad84cd0d531a0"
33
FROM ${CONTAINER_REGISTRY_PREFIX}valord577/cross-sysroot-mingw:${TOOLCHAIN_IMAGE_VERSION}
44

55
RUN apt-get update -qq \
@@ -10,7 +10,7 @@ RUN apt-get update -qq \
1010
ARG TARGETOS
1111
ARG TARGETARCH
1212

13-
ENV GOLANG_SDK="1.23.5"
13+
ENV GOLANG_SDK="1.24.2"
1414
ENV GOLANG_SDK_ROOT="/opt/go"
1515
RUN <<EOT
1616
#!/usr/bin/env bash

mingw-cross-native/Dockerfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG CONTAINER_REGISTRY_PREFIX
2-
ARG TOOLCHAIN_IMAGE_VERSION="91c0455fb1f6035ff116deea896e8888c776b754"
2+
ARG TOOLCHAIN_IMAGE_VERSION="908b71b2c95c01591ed1093f98bad84cd0d531a0"
33
FROM ${CONTAINER_REGISTRY_PREFIX}valord577/cross-sysroot-mingw:${TOOLCHAIN_IMAGE_VERSION}
44

55
# Install Cmake
66
ARG CMAKE_URL="https://cmake.org/files"
77
ENV CMAKE_X="3"
88
ENV CMAKE_Y="30"
9-
ENV CMAKE_Z="6"
9+
ENV CMAKE_Z="8"
1010
ENV CMAKE_ROOT="/opt/cmake"
1111
RUN <<EOT
1212
#!/usr/bin/env bash
@@ -35,13 +35,17 @@ EOT
3535
ENV PATH="${CMAKE_ROOT}/bin:${PATH}"
3636

3737

38-
RUN apt-get update -qq \
38+
RUN apt-get update -qq \
3939
&& apt-get install -qqy \
40-
libc6-dev \
40+
file tree patchelf curl \
41+
zip unzip xz-utils \
42+
git nasm make python3 python3-venv \
4143
&& apt-get clean all -qqy
4244

45+
# required for host tools
4346
RUN apt-get update -qq \
4447
&& apt-get install -qqy \
45-
file tree patchelf curl zip unzip xz-utils \
46-
git nasm make python3 python3-venv \
48+
libc6-dev binutils \
49+
libgcc-12-dev \
50+
libstdc++-12-dev \
4751
&& apt-get clean all -qqy

0 commit comments

Comments
 (0)