Skip to content

Commit

Permalink
updated dockerfile (#299)
Browse files Browse the repository at this point in the history
* updated dockerfile

* add parallel build flag to dockerfile

* Adds CI jobs to build our docker container  (#302)

* Adding a step that at least builds the docker container.  I'm not yet sure how I want to actually integrate tests within the container, but at the least we should verify it builds

* docker build needs a path. i honestly thought it defaulted to the CWD

---------

Co-authored-by: Dax Pryce <daxpryce@microsoft.com>
  • Loading branch information
harsha-simhadri and daxpryce committed Apr 5, 2023
1 parent ed59551 commit 5fd8871
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 10 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
name: DiskANN Pull Request Build and Test
on: [pull_request]
jobs:
docker-container-build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Docker build
run: |
docker build .
build-and-run:
name: Build and run tests for ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/push-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ jobs:
- name: Python Build
run: python -m build

docker-container-build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Docker build
run: |
docker build .
windows-build:
name: Build for ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand Down
24 changes: 14 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
FROM ubuntu:16.04
MAINTAINER Changxu Wang <wang_changxu@zju.edu.cn>
#Copyright(c) Microsoft Corporation.All rights reserved.
#Licensed under the MIT license.

RUN apt-get update -y
RUN apt-get install -y g++ cmake libboost-dev libgoogle-perftools-dev
FROM ubuntu:jammy

COPY . /opt/nsg
RUN apt update
RUN apt install -y software-properties-common
RUN add-apt-repository -y ppa:git-core/ppa
RUN apt update
RUN DEBIAN_FRONTEND=noninteractive apt install -y git make cmake g++ libaio-dev libgoogle-perftools-dev libunwind-dev clang-format libboost-dev libboost-program-options-dev libmkl-full-dev libcpprest-dev python3.10

WORKDIR /opt/nsg

RUN mkdir -p build && cd build && \
cmake -DCMAKE_BUILD_TYPE=Release .. && \
make -j $(nproc)
WORKDIR /app
RUN git clone https://github.com/microsoft/DiskANN.git
WORKDIR /app/DiskANN
RUN mkdir build
RUN cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
RUN cmake --build build -- -j

0 comments on commit 5fd8871

Please sign in to comment.