Skip to content

Commit

Permalink
Rework images (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
mwestphal authored May 5, 2023
1 parent 9433f7c commit 344c9e6
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 60 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/build_docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,11 @@ jobs:
with:
push: ${{ github.ref == 'refs/heads/main' }}
tags: ghcr.io/f3d-app/f3d-ci:latest
file: Dockerfile
file: ci/Dockerfile

- name: Build and push superbuild
uses: docker/build-push-action@v3
with:
push: ${{ github.ref == 'refs/heads/main' }}
tags: ghcr.io/f3d-app/f3d-superbuild-ci:latest
file: superbuild/Dockerfile
56 changes: 0 additions & 56 deletions Dockerfile

This file was deleted.

5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# F3D CI Docker setup
# F3D Docker images for CI

A Dockerfile and automatic workflow to generate a docker image
used by all F3D CI.
A collection of Dockerfile used by F3D differents continuous integrations.

# License

Expand Down
31 changes: 31 additions & 0 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM ubuntu:23.04

# Install generic build dependency
RUN apt update && apt install -y \
build-essential \
cmake \
clang

# Install VTK build dependency
RUN apt update && apt install -y \
libgl1-mesa-dev \
libglfw3-dev \
libglu1-mesa \
libssl-dev \
libx11-dev \
libxcursor-dev \
libxt-dev

# Install F3D build and test dependency
RUN apt update && apt install -y \
default-jdk \
help2man \
libqt5opengl5-dev \
python3-dev

# Install CI tools
RUN apt update && apt install -y \
git \
git-lfs \
lcov \
xvfb
52 changes: 52 additions & 0 deletions superbuild/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
FROM ubuntu:18.04

# Install dockerfile dependency
RUN apt update && apt install -y \
ca-certificates \
cargo \
libssl-dev \
pkg-config \
software-properties-common \
wget

# Install generic build dependency
RUN apt update && apt install -y \
build-essential \
g++-8 \
gcc-8

# Install VTK build dependency
RUN apt update && apt install -y \
libgl1-mesa-dev \
libglfw3-dev \
libglu1-mesa \
libssl-dev \
libx11-dev \
libxcursor-dev \
libxt-dev

# Install F3D build dependency
RUN apt update && apt install -y help2man

# Install superbuild dependencies
RUN apt update && apt install -y \
chrpath \
curl \
gzip

# Install CI tools
RUN apt update && apt install -y xvfb

# Install up-to-date needed packages
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
RUN add-apt-repository ppa:git-core/ppa
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
RUN apt update && apt install -y cmake git git-lfs

# Install sccache
RUN cargo install sccache
ENV PATH="${PATH}:/root/.cargo/bin"

# Use gcc-8 by default
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8

0 comments on commit 344c9e6

Please sign in to comment.