Skip to content

Commit acb7c59

Browse files
committed
fix(build): adding fmt and cleanup docker image
1 parent 1404ebd commit acb7c59

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

docker/Dockerfile

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
FROM ubuntu:20.04
23

34
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -10,29 +11,13 @@ RUN dpkg-reconfigure tzdata
1011

1112
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get install -y git build-essential cmake
1213

13-
RUN echo "Cloning Substrait-CPP"
14-
1514
RUN git clone https://github.com/substrait-io/substrait-cpp.git \
1615
&& cd substrait-cpp \
1716
&& git submodule sync --recursive \
1817
&& git submodule update --init --recursive
1918

20-
RUN echo $(pwd)
21-
22-
RUN cd substrait-cpp && echo $(ls)
23-
24-
RUN echo $(pwd)
25-
26-
#RUN useradd -ms /bin/bash substrait && adduser substrait sudo
27-
28-
#RUN chown substrait /substrait/substrait-cpp
29-
30-
#USER substrait
31-
RUN apt-get install wget
32-
3319
RUN cd substrait-cpp && ./scripts/setup-ubuntu.sh
3420

35-
ENTRYPOINT ["/bin/bash"]
36-
37-
21+
RUN cd substrait-cpp && make
3822

23+
ENTRYPOINT ["/bin/bash"]

docker/README.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Setup Docker Container
2+
3+
## Build
4+
5+
```bash
6+
docker build -t substrait-cpp .
7+
```
8+
9+
## Run
10+
11+
```bash
12+
docker run -it substrait-cpp
13+
```
14+
15+
## Evaluate
16+
17+
Run function tests
18+
19+
```bash
20+
./build-Debug/substrait/function/tests/substrait_function_test
21+
```
22+
23+

third_party/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
add_subdirectory(fmt)
34
add_subdirectory(googletest)
45

56
set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing")

0 commit comments

Comments
 (0)