Skip to content

Commit 4839c1d

Browse files
authored
Merge pull request #351 from aminya/test [skip test]
fix: use logged in bash as the entry point of docker + add more docker tests
2 parents 4045311 + 6e542e6 commit 4839c1d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+247
-901
lines changed

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,8 @@
7272
"prettier.enable": false,
7373
"javascript.preferences.importModuleSpecifierEnding": "js",
7474
"typescript.preferences.importModuleSpecifierEnding": "js",
75-
"eslint.useESLintClass": true
75+
"eslint.useESLintClass": true,
76+
"yaml.schemas": {
77+
"https://json.schemastore.org/container-structure-test.json": "/dev/docker/ci/tests/*.yml"
78+
}
7679
}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,15 +338,15 @@ RUN apt-get update -qq && \
338338
rm -rf /var/lib/apt/lists/* && \
339339
rm -rf /tmp/*
340340
341-
ENTRYPOINT ["/bin/bash"]
341+
SHELL ["/bin/bash", "-l", "-c"]
342+
ENTRYPOINT ["/bin/bash", "-l"]
342343
343344
#### Building (example)
344345
FROM setup-cpp-ubuntu AS builder
345346
346347
COPY ./dev/cpp_vcpkg_project /home/app
347348
WORKDIR /home/app
348-
RUN bash -c 'source ~/.cpprc \
349-
&& task build'
349+
RUN task build
350350
351351
#### Running environment
352352
# use a fresh image as the runner

dev/docker/ci/arch-gcc.dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
88
rm -rf /var/cache/pacman/pkg/* && \
99
rm -rf /tmp/*
1010

11-
ENTRYPOINT ["/bin/bash"]
11+
SHELL ["/bin/bash", "-l", "-c"]
12+
ENTRYPOINT ["/bin/bash", "-l"]

dev/docker/ci/arch-gcc.yml

Lines changed: 0 additions & 68 deletions
This file was deleted.

dev/docker/ci/arch-llvm.dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
88
rm -rf /var/cache/pacman/pkg/* && \
99
rm -rf /tmp/*
1010

11-
ENTRYPOINT ["/bin/bash"]
11+
SHELL ["/bin/bash", "-l", "-c"]
12+
ENTRYPOINT ["/bin/bash", "-l"]

dev/docker/ci/arch-llvm.yml

Lines changed: 0 additions & 68 deletions
This file was deleted.

dev/docker/ci/arch-mingw.dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
99
rm -rf /var/cache/pacman/pkg/* && \
1010
rm -rf /tmp/*
1111

12-
ENTRYPOINT ["/bin/bash"]
12+
SHELL ["/bin/bash", "-l", "-c"]
13+
ENTRYPOINT ["/bin/bash", "-l"]

dev/docker/ci/arch-mingw.yml

Lines changed: 0 additions & 79 deletions
This file was deleted.

dev/docker/ci/arch.dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ RUN pacman -Syuu --noconfirm && \
3636
rm -rf /var/cache/pacman/pkg/* && \
3737
rm -rf /tmp/*
3838

39-
ENTRYPOINT ["/bin/bash"]
39+
SHELL ["/bin/bash", "-l", "-c"]
40+
ENTRYPOINT ["/bin/bash", "-l"]

dev/docker/ci/arch.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)