Skip to content

Commit ae58022

Browse files
author
abeimler
committed
fix: fedora docker builds
1 parent 43fd660 commit ae58022

File tree

5 files changed

+6
-40
lines changed

5 files changed

+6
-40
lines changed

dev/container-tests/arch.mingw.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ schemaVersion: 2.0.0
22

33
commandTests:
44
- name: mingw c compiler
5-
command: $CC
5+
command: x86_64-w64-mingw32-gcc
66
args: ["--version"]
77
expectedOutput: [".*x86_64-w64-mingw32-gcc.*"]
88
- name: mingw c++ compiler
9-
command: $CXX
9+
command: x86_64-w64-mingw32-g++
1010
args: ["--version"]
1111
expectedOutput: [".*x86_64-w64-mingw32-g\\+\\+*"]
1212
- name: powershell
@@ -18,9 +18,6 @@ fileExistenceTests:
1818
- name: "vcpkg"
1919
path: "/root/vcpkg"
2020
shouldExist: true
21-
- name: "cmake toolchain"
22-
path: "/home/cmake/toolchains/x86_64-w64-mingw32.toolchain.cmake"
23-
shouldExist: true
2421
- name: "cross root"
2522
path: "/usr/x86_64-w64-mingw32"
2623
shouldExist: true

dev/container-tests/fedora.mingw.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ schemaVersion: 2.0.0
22

33
commandTests:
44
- name: mingw c compiler
5-
command: $CC
5+
command: x86_64-w64-mingw32-gcc
66
args: ["--version"]
77
expectedOutput: [".*x86_64-w64-mingw32-gcc.*"]
88
- name: mingw c++ compiler
9-
command: $CXX
9+
command: x86_64-w64-mingw32-cpp
1010
args: ["--version"]
1111
expectedOutput: [".*x86_64-w64-mingw32-cpp.*"]
1212
- name: powershell
@@ -18,9 +18,6 @@ fileExistenceTests:
1818
- name: "vcpkg"
1919
path: "/root/vcpkg"
2020
shouldExist: true
21-
- name: "cmake toolchain"
22-
path: "/home/cmake/toolchains/x86_64-w64-mingw32.toolchain.cmake"
23-
shouldExist: true
2421
- name: "cross root"
2522
path: "/usr/x86_64-w64-mingw32"
2623
shouldExist: true

dev/docker/arch_node.mingw.dockerfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,10 @@ RUN rm -rf /tmp/*
4242
CMD source ~/.cpprc
4343
ENTRYPOINT [ "/bin/bash" ]
4444

45-
## setup vcpkg env. (triplets)
46-
## https://github.com/microsoft/vcpkg/blob/master/docs/users/mingw.md
47-
ENV VCPKG_DEFAULT_HOST_TRIPLET "x64-linux"
48-
ENV VCPKG_DEFAULT_TRIPLET "x64-mingw-dynamic"
49-
ENV CC "x86_64-w64-mingw32-gcc"
50-
ENV CXX "x86_64-w64-mingw32-g++"
51-
52-
# TODO: better setup for cmake toolchains ?
53-
COPY ./dev/cmake/x86_64-w64-mingw32.toolchain.cmake /home/cmake/toolchains/x86_64-w64-mingw32.toolchain.cmake
54-
5545
#### Building
5646
FROM base AS builder
5747
COPY ./dev/cpp_vcpkg_project /home/app
5848
WORKDIR /home/app
5949
RUN bash -c 'source ~/.cpprc \
60-
&& task cross_build_mingw'
50+
&& task build_cross_mingw'
6151

dev/docker/fedora_node.mingw.dockerfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,9 @@ RUN rm -rf /tmp/*
2020
CMD source ~/.cpprc
2121
ENTRYPOINT [ "/bin/bash" ]
2222

23-
## setup vcpkg env. (triplets)
24-
## https://github.com/microsoft/vcpkg/blob/master/docs/users/mingw.md
25-
ENV VCPKG_DEFAULT_HOST_TRIPLET "x64-linux"
26-
ENV VCPKG_DEFAULT_TRIPLET "x64-mingw-dynamic"
27-
ENV CC "x86_64-w64-mingw32-gcc"
28-
ENV CXX "x86_64-w64-mingw32-cpp"
29-
30-
# TODO: better setup for cmake toolchains ?
31-
COPY ./dev/cmake/x86_64-w64-mingw32.toolchain.cmake /home/cmake/toolchains/x86_64-w64-mingw32.toolchain.cmake
32-
3323
#### Building
3424
FROM base AS builder
3525
COPY ./dev/cpp_vcpkg_project /home/app
3626
WORKDIR /home/app
3727
RUN bash -c 'source ~/.cpprc \
38-
&& task cross_build_mingw'
28+
&& task build_cross_mingw'

dev/docker/ubuntu_node.mingw.dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ RUN rm -rf /tmp/*
1717
CMD source ~/.cpprc
1818
ENTRYPOINT [ "/bin/bash" ]
1919

20-
## setup vcpkg env. (triplets)
21-
## https://github.com/microsoft/vcpkg/blob/master/docs/users/mingw.md
22-
#ENV VCPKG_DEFAULT_HOST_TRIPLET "x64-linux"
23-
#ENV VCPKG_DEFAULT_TRIPLET "x64-mingw-dynamic"
24-
#ENV CC "x86_64-w64-mingw32-gcc"
25-
#ENV CXX "x86_64-w64-mingw32-g++"
26-
## use project_options cross-compiling to setup triplets ...
27-
2820
#### Building
2921
FROM base AS builder
3022
COPY ./dev/cpp_vcpkg_project /home/app

0 commit comments

Comments
 (0)