Skip to content

Commit

Permalink
fix: docker builds
Browse files Browse the repository at this point in the history
* add git submodule
  • Loading branch information
abeimler committed Jan 18, 2023
1 parent f0dc459 commit cea7382
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ ENTRYPOINT [ "/docker-entrypoint.sh" ]
FROM setup AS build
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task myproj:build"]


FROM setup AS test
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task myproj:test"]

5 changes: 5 additions & 0 deletions docker/Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,25 @@ ENTRYPOINT [ "/docker-entrypoint.sh" ]
FROM setup AS build
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task rpi4:build.cross"]

FROM setup AS build-debug
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task rpi4:build.cross.debug"]

FROM setup AS build-vcpkg
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task rpi4-vcpkg:build.cross"]

FROM setup AS build-custom
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task rpi4:build.cross.custom-toolchain"]


Expand All @@ -48,5 +52,6 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/*
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
ENV QEMU_LD_PREFIX /usr/aarch64-linux-gnu
CMD ["/bin/bash", "-c", "task rpi4:build.cross && qemu-aarch64 /home/project_options/tests/rpi4/build/Release/example"]
2 changes: 2 additions & 0 deletions docker/Dockerfile.arm
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ ENTRYPOINT [ "/docker-entrypoint.sh" ]
FROM setup AS build
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task rpi3:build.cross"]


FROM setup AS build-debug
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task rpi3:build.cross.debug"]
1 change: 1 addition & 0 deletions docker/Dockerfile.emscripten
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ ENTRYPOINT [ "/docker-entrypoint.sh" ]
FROM setup AS build
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task emscripten:build"]
4 changes: 4 additions & 0 deletions docker/Dockerfile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,26 @@ ENTRYPOINT [ "/docker-entrypoint.sh" ]
FROM setup AS build
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task myproj:build.mingw"]


FROM setup AS build-minimal
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task minimal:build.mingw"]


FROM setup AS build-minimal-from-env
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task minimal:build.mingw.from-env"]


FROM setup AS build-minimal-from-triplet
COPY . /home/project_options
WORKDIR /home/project_options
RUN git submodule update --init
CMD ["/bin/bash", "-c", "task minimal:build.mingw.from-triplet"]
1 change: 1 addition & 0 deletions examples/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ version: 3
includes:
cpp_vcpkg_project:
taskfile: ./cpp_vcpkg_project/Taskfile.yml
optional: true
dir: ./cpp_vcpkg_project
vars:
CMAKE_GENERATOR: "Ninja Multi-Config"

0 comments on commit cea7382

Please sign in to comment.