Skip to content

Commit

Permalink
Moved dependency_versions into docker/common/
Browse files Browse the repository at this point in the history
  • Loading branch information
TimSchneider42 committed May 27, 2024
1 parent adb4fd8 commit a9f6b89
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ jobs:
- name: Install other dependencies
run: |
set -a
. ./dependency_versions
set +a
./docker/common/install-dependencies
- name: Configure & make
Expand Down
4 changes: 1 addition & 3 deletions docker/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ LABEL maintainer="Tim Schneider <[email protected]>"

RUN yum -y install poco-devel*

ADD dependency_versions /tmp/
ADD docker/common/ /tmp/common/
ARG LIBFRANKA_VERSION
RUN set -a && . /tmp/dependency_versions && set +a \
&& /tmp/common/install-dependencies
RUN /tmp/common/install-dependencies

ARG PYBIN_SUPPORTED_VERSIONS="cp3(7m|8|9|10|11|12)"
# Preserve argument for runtime
Expand Down
4 changes: 4 additions & 0 deletions docker/build/build-wheels
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
set -e

manylinux-build-wheels /code
File renamed without changes.
4 changes: 4 additions & 0 deletions docker/common/install-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ set -e

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

set -a
. "${SCRIPT_DIR}/dependency_versions"
set +a

echo "Installing dependencies..."
"${SCRIPT_DIR}/install-eigen"
"${SCRIPT_DIR}/install-pybind11"
Expand Down
4 changes: 1 addition & 3 deletions docker/run/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ LABEL maintainer="Tim Schneider <[email protected]>"
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install build-essential cmake git libpoco-dev catch2 python3-dev

ADD dependency_versions /tmp/
ADD docker/common/ /tmp/common/
ARG LIBFRANKA_VERSION
RUN set -a && . /tmp/dependency_versions && set +a \
&& /tmp/common/install-dependencies
RUN /tmp/common/install-dependencies

RUN git clone https://github.com/TimSchneider42/franky.git --recurse-submodules \
&& cd franky \
Expand Down

0 comments on commit a9f6b89

Please sign in to comment.