From a9f6b89e220b1a83bd98f1e62dbb779ac38948b0 Mon Sep 17 00:00:00 2001
From: Tim Schneider <mail@tim-schneider.me>
Date: Tue, 28 May 2024 00:21:53 +0200
Subject: [PATCH] Moved dependency_versions into docker/common/

---
 .github/workflows/build_and_test.yml                     | 3 ---
 docker/build/Dockerfile                                  | 4 +---
 docker/build/build-wheels                                | 4 ++++
 dependency_versions => docker/common/dependency_versions | 0
 docker/common/install-dependencies                       | 4 ++++
 docker/run/Dockerfile                                    | 4 +---
 6 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100755 docker/build/build-wheels
 rename dependency_versions => docker/common/dependency_versions (100%)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index cd2dfdb2..e2bc7078 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -24,9 +24,6 @@ jobs:
 
       - name: Install other dependencies
         run: |
-          set -a
-          . ./dependency_versions
-          set +a
           ./docker/common/install-dependencies
 
       - name: Configure & make
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index 14f329cd..b3c8693e 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -4,11 +4,9 @@ LABEL maintainer="Tim Schneider <tim@robot-learning.de>"
 
 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
diff --git a/docker/build/build-wheels b/docker/build/build-wheels
new file mode 100755
index 00000000..92ab46ac
--- /dev/null
+++ b/docker/build/build-wheels
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+manylinux-build-wheels /code
\ No newline at end of file
diff --git a/dependency_versions b/docker/common/dependency_versions
similarity index 100%
rename from dependency_versions
rename to docker/common/dependency_versions
diff --git a/docker/common/install-dependencies b/docker/common/install-dependencies
index be8d562f..c55dc9ab 100755
--- a/docker/common/install-dependencies
+++ b/docker/common/install-dependencies
@@ -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"
diff --git a/docker/run/Dockerfile b/docker/run/Dockerfile
index 4fa2f515..ab6b0a16 100644
--- a/docker/run/Dockerfile
+++ b/docker/run/Dockerfile
@@ -5,11 +5,9 @@ LABEL maintainer="Tim Schneider <tim@robot-learning.de>"
 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 \