saundersp/ViolaJones
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpp : Fixed Docker image execution

Browse Source
This commit is contained in:
saundersp 2024-05-01 15:14:04 +02:00
parent 4a42747837
commit 2e7b7313c3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/Dockerfile
View File

@ -11,7 +11,7 @@ WORKDIR /home/ViolaJones/cpp
RUN dnf install -y make-1:4.3-7.el9 && dnf clean all RUN dnf install -y make-1:4.3-7.el9 && dnf clean all
COPY --from=builder /home/ViolaJones/cpp/bin ./bin COPY --from=builder /home/ViolaJones/cpp/bin ./bin
COPY Makefile . COPY --from=builder /home/ViolaJones/cpp/Makefile .
ENTRYPOINT ["make"] ENTRYPOINT ["make"]
CMD ["start"] CMD ["start"]

4
cpp/Makefile
View File

@ -36,7 +36,9 @@ $(OBJ_DIR)/%.$(OBJ_EXT): $(SRC_DIR)/%.cu | $(OBJ_DIR) check-nvcc-works
@echo Compiling $< @echo Compiling $<
@$(CC) $(CFLAGS) -c $< -o $@ @$(CC) $(CFLAGS) -c $< -o $@
$(EXEC): $(OBJ) | check-nvcc-works # FIXME When using the docker image, Make check prequisites even when the target already exists
#$(EXEC): $(OBJ) | check-nvcc-works
$(EXEC): $(OBJ)
@echo Linking objects files to $@ @echo Linking objects files to $@
@$(CC) $(CFLAGS) $^ -o $@ @$(CC) $(CFLAGS) $^ -o $@