Skip to content

Commit 55a2c3d

Browse files
committed
reduce number of docker layers
1 parent c2e4abc commit 55a2c3d

6 files changed

Lines changed: 28 additions & 29 deletions
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
FROM ubuntu:22.04
22
COPY install.sh /
33
ARG irods_package_version
4-
ENV IRODS_PACKAGE_VERSION "$irods_package_version"
4+
ENV IRODS_PACKAGE_VERSION="$irods_package_version"
55
RUN for phase in initialize install-essential-packages add-package-repo; do \
66
bash /install.sh --w=$phase 0; \
7-
done
8-
RUN /install.sh 4
7+
done && \
8+
/install.sh 4
99
COPY start_postgresql_and_irods.sh manage_irods5_procs /
10-
RUN apt install -y sudo
11-
RUN useradd -ms/bin/bash testuser
12-
RUN echo 'testuser ALL=(ALL) NOPASSWD: ALL' >>/etc/sudoers
13-
RUN apt install -y faketime
10+
RUN apt install -y sudo && \
11+
useradd -ms/bin/bash testuser && \
12+
echo 'testuser ALL=(ALL) NOPASSWD: ALL' >>/etc/sudoers
1413
ENV IRODS_CONTROL_PATH=""
1514
CMD bash $IRODS_CONTROL_PATH/start_postgresql_and_irods.sh
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM install-irods
2+
RUN apt update
3+
RUN apt install -y python3-pip bats && \
4+
python3 -m pip install --upgrade pip && \
5+
python3 -m pip install virtualenv && \
6+
python3 -m virtualenv /py3

irods/test/harness/001_bats-python3.Dockerfile

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM bats-and-system-python
2+
RUN apt update && \
3+
apt install -y wget build-essential && \
4+
apt install -y libssl-dev zlib1g-dev libffi-dev libncurses-dev wget build-essential
5+
ARG python_version
6+
RUN wget https://www.python.org/ftp/python/${python_version}/Python-${python_version}.tar.xz && \
7+
tar xf Python-${python_version}.tar.xz
8+
WORKDIR /Python-${python_version}
9+
RUN ./configure --prefix /root/python --with-ensurepip=install && \
10+
make -j && \
11+
mkdir /root/python && \
12+
make install
13+
WORKDIR /
14+
RUN /root/python/bin/python3 -m pip install virtualenv && \
15+
chmod a+rx /root
16+
ENV PYTHON_VERSION=${python_version}

irods/test/harness/002_ssl-and-pam.Dockerfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

irods/test/harness/003_compile-specific-python.Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)