Commit 7d5e2f3d authored by Charles G Waldman's avatar Charles G Waldman
Browse files

cleanup old Docker setup

parent 2014ce10

.gitlab-ci.yml

+0 −22
Original line number Diff line number Diff line 
image: hello-world:latest



stages:

# - build-img

# - spack-test

  - test



workflow:
@@ -42,26 +40,6 @@ test:no_cgal: 
    ENABLE_CGAL: "OFF"

  <<: *cmake_def



# .spack-test:spack: &spack_def

#   stage: test

#   image: $CI_REGISTRY_IMAGE:latest

#   needs: ['build-img']

#   when: manual

#   script:

#     - /usr/local/spack/bin/spack repo add .spack/repo

#     - /usr/local/spack/bin/spack install csg-eb ${NO_CSG}

#   tags:

#     - docker



# spack-test:cgal:

#   variables:

#     NO_CSG: ""

#   <<: *spack_def



# spack-test:no_cgal:

#   variables:

#     NO_CSG: "~cgal"

#   <<: *spack_def



.test:gnumake: &gnumake_def

  stage: test

CMakeLists.txt

+1 −6
Original line number Diff line number Diff line
@@ -14,11 +14,6 @@ set(CMAKE_CXX_EXTENSIONS OFF) 


option(CSG_CGAL_ENABLED   "Enable CGAL"   ON)



find_program(CCACHE_FOUND ccache)

if(CCACHE_FOUND)

  set( CMAKE_CXX_COMPILER_LAUNCHER ccache )

endif()



find_package(pegtl REQUIRED)



if (CSG_CGAL_ENABLED)

Dockerfile

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
# Docker Image for running csg-eb tests



FROM ubuntu:20.04



LABEL maintainer="Mark Meredith <mark.meredith@netl.doe.gov>"



ENV DEBIAN_FRONTEND noninteractive



RUN apt-get -qq update \

  && apt-get -qq -y install --no-install-recommends \

  build-essential=12.* \

  git=1:2.* \

  file=1:5.* \

  openscad=2019.* \

  pkg-config=0.29.* \

  python3-pip=20.* \

  python3-venv=3.8.* \

  libgmp-dev \

  libmpfr-dev \

  libboost-all-dev \

  && apt-get clean && rm -rf /var/lib/apt/lists/* \



  && pip3 install --no-cache-dir \

  cmake==3.* \

  ninja==1.* \



  && git clone -c feature.manyFiles=true https://github.com/spack/spack.git /usr/local/spack \



  && PATH=/usr/local/spack/bin:$PATH



RUN git clone --depth 1 --branch v2.13.7 https://github.com/catchorg/Catch2

WORKDIR /Catch2

RUN cmake -S . -B build -DCATCH_BUILD_TESTING=OFF

RUN cmake --build build --target install

WORKDIR /



RUN git clone --depth 1 --branch v5.3 https://github.com/CGAL/cgal

WORKDIR /cgal

RUN cmake -S . -B build

RUN cmake --build build --target install

WORKDIR /



RUN git clone --branch 3.2.2 https://github.com/taocpp/PEGTL

WORKDIR /PEGTL

RUN cmake -S . -B build -DPEGTL_BUILD_TESTS=OFF -DPEGTL_BUILD_EXAMPLES=OFF

RUN cmake --build build --target install

WORKDIR /



RUN  useradd --create-home -s /bin/bash user



WORKDIR /home/user

USER user



CMD [ "/bin/bash" ]

README.md

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Install the following dependencies before building `csg-eb` 
 - [CMake](https://cmake.org) >=3.14

 - [PEGTL](https://github.com/taocpp/PEGTL) for parsing

 - [Catch2](https://github.com/catchorg/Catch2) for testing framework

 - [CGAL](https://www.cgal.org) for geometry computation (CGAL 5.x). Note we currently do not support newer CGAL versions >= 6.0

 - [CGAL](https://www.cgal.org) for geometry computation.





## Build