diff --git a/daemons/Dockerfile b/daemons/Dockerfile index 8c45d85..9a1c12e 100644 --- a/daemons/Dockerfile +++ b/daemons/Dockerfile @@ -34,18 +34,6 @@ RUN dnf install -y epel-release.noarch && \ dnf clean all && \ rm -rf /var/cache/dnf -# cx_oracle requires `gcc` and Python headers, not present by default on arm64 -ARG TARGETARCH -RUN if [ $TARGETARCH = "arm64" ]; then \ - dnf install -y \ - gcc \ - python3-devel \ - ; fi - -RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \ - echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \ - ldconfig - RUN python3 -m pip install --no-cache-dir --upgrade pip && \ python3 -m pip install --no-cache-dir --upgrade setuptools RUN python3 -m pip install --no-cache-dir --pre rucio[oracle,mysql,postgresql,globus]==$TAG diff --git a/init/Dockerfile b/init/Dockerfile index d4f3d82..0db3805 100644 --- a/init/Dockerfile +++ b/init/Dockerfile @@ -19,9 +19,6 @@ RUN dnf install -y epel-release.noarch && \ dnf clean all && \ rm -rf /var/cache/dnf -RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \ - echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \ - ldconfig RUN python3 -m pip install --no-cache-dir --upgrade pip RUN python3 -m pip install --no-cache-dir --upgrade setuptools RUN python3 -m pip install --pre rucio[oracle,mysql,postgresql]==$TAG diff --git a/probes/Dockerfile b/probes/Dockerfile index f6809c6..f547e04 100644 --- a/probes/Dockerfile +++ b/probes/Dockerfile @@ -26,10 +26,6 @@ RUN dnf install -y epel-release.noarch && \ dnf clean all && \ rm -rf /var/cache/dnf -RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \ - echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \ - ldconfig - RUN rpm -i https://github.com/dshearer/jobber/releases/download/v1.4.0/jobber-1.4.0-1.el7.x86_64.rpm RUN python3 -m pip install --no-cache-dir --upgrade pip diff --git a/server/Dockerfile b/server/Dockerfile index c727ee1..68ae697 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -25,19 +25,6 @@ RUN dnf install -y epel-release.noarch && \ dnf clean all && \ rm -rf /var/cache/dnf -# cx_oracle requires `gcc` and Python headers, not present by default on arm64 -ARG TARGETARCH -RUN if [ $TARGETARCH = "arm64" ]; then \ - dnf install -y \ - gcc \ - python3-devel \ - ; fi - - -RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \ - echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \ - ldconfig - RUN python3 -m pip install --no-cache-dir --upgrade pip && \ python3 -m pip install --no-cache-dir --upgrade setuptools RUN python3 -m pip install --no-cache-dir --pre rucio[oracle,mysql,postgresql]==$TAG diff --git a/ui/Dockerfile b/ui/Dockerfile index 43d8d23..ca81cc0 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -32,9 +32,6 @@ RUN dnf install -y epel-release.noarch && \ dnf clean all && \ rm -rf /var/cache/dnf -RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \ - echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \ - ldconfig RUN python3 -m pip install --no-cache-dir --upgrade pip RUN python3 -m pip install --no-cache-dir --upgrade setuptools RUN python3 -m pip install --no-cache-dir --pre rucio[oracle,mysql,postgresql]==$TAG