Skip to content

Commit a910f0d

Browse files
authored
Merge pull request #100 from aminya/fedora [skip ci]
2 parents 09018b0 + 834fea8 commit a910f0d

Some content is hidden

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

41 files changed

+249
-90
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
- "ubuntu_node.dockerfile"
9393
- "ubuntu_20.04_node.dockerfile"
9494
- "arch_node.dockerfile"
95+
- "fedora_node.dockerfile"
9596
node:
9697
- 14
9798
pnpm:

dev/docker/arch_node.dockerfile

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,13 @@
22
FROM archlinux as base
33

44
RUN pacman -Syuu --noconfirm
5+
RUN pacman-db-upgrade
56

6-
# Install packages available from standard repos
7-
RUN pacman-db-upgrade && \
8-
pacman -S --noconfirm --needed \
9-
wget curl pkg-config zip unzip tar git && \
10-
pacman -S --noconfirm \
11-
nodejs && \
12-
pacman -Scc --noconfirm
7+
# nodejs
8+
RUN pacman -S --noconfirm --needed nodejs
139

14-
# install yay
15-
#RUN useradd -m -G nobody -s /bin/bash yay && passwd -d yay && echo "yay ALL=(ALL) ALL" >> /etc/sudoers
16-
#RUN git clone --depth 1 https://aur.archlinux.org/yay.git /opt/yay && cd /opt/yay && \
17-
# chown -R yay:root . && chmod -R 775 . && \
18-
# runuser -l yay -c "cd /opt/yay && makepkg -si --noprogressbar --noconfirm"
10+
# curl for downloading setup-cpp
11+
RUN pacman -S --noconfirm --needed curl
1912

2013
# add setup_cpp.js
2114
COPY "./dist/" "/"
@@ -26,7 +19,6 @@ RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck tru
2619

2720
# clean up
2821
RUN pacman -Scc --noconfirm
29-
#RUN rm -rf /home/yay/.cache/*
3022
RUN rm -rf /tmp/*
3123

3224
CMD source ~/.cpprc

dev/docker/fedora_node.dockerfile

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
## base image
2+
FROM fedora as base
3+
4+
# nodejs
5+
RUN dnf -y install nodejs
6+
7+
# curl for downloading setup-cpp
8+
RUN dnf -y install curl
9+
10+
# add setup_cpp.js
11+
COPY "./dist/" "/"
12+
WORKDIR "/"
13+
14+
# run installation
15+
RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true
16+
17+
# clean up
18+
RUN rm -rf /tmp/*
19+
20+
CMD source ~/.cpprc
21+
ENTRYPOINT [ "/bin/bash" ]
22+
23+
#### Building
24+
FROM base AS builder
25+
COPY ./dev/cpp_vcpkg_project /home/app
26+
WORKDIR /home/app
27+
RUN bash -c 'source ~/.cpprc \
28+
&& task build'
29+
30+
### Running environment
31+
# use a distroless image or ubuntu:22.04 if you wish
32+
FROM gcr.io/distroless/cc
33+
# copy the built binaries and their runtime dependencies
34+
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
35+
WORKDIR /home/app/
36+
ENTRYPOINT ["./my_exe"]

dist/actions_python.239cf807.js renamed to dist/actions_python.3d426834.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/actions_python.239cf807.js.map renamed to dist/actions_python.3d426834.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/actions_python.aa574a9a.js renamed to dist/actions_python.a137bcdc.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/actions_python.aa574a9a.js.map renamed to dist/actions_python.a137bcdc.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.mjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)