Commit 7b5baa51 authored by Bartosz Podrygajlo's avatar Bartosz Podrygajlo

ci: Speedup fhi72 dockerfiles

Move COPY . . down in 7.2 dockerfiles. This layer doesn't cache well due to
changes in docker context, moving it down allows docker builder to cache other
layers that are not affected by the context.
Signed-off-by: default avatarBartosz Podrygajlo <bartosz.podrygajlo@openairinterface.org>
parent c4125d1c
...@@ -27,7 +27,6 @@ RUN apt-get update && \ ...@@ -27,7 +27,6 @@ RUN apt-get update && \
RUN rm -Rf /oai-ran RUN rm -Rf /oai-ran
WORKDIR /oai-ran WORKDIR /oai-ran
COPY . .
## Download and build DPDK ## Download and build DPDK
RUN wget --no-verbose http://fast.dpdk.org/rel/dpdk-24.11.4.tar.xz && \ RUN wget --no-verbose http://fast.dpdk.org/rel/dpdk-24.11.4.tar.xz && \
...@@ -54,6 +53,8 @@ RUN git clone https://git.gitlab.arm.com/networking/ral.git /opt/ral && \ ...@@ -54,6 +53,8 @@ RUN git clone https://git.gitlab.arm.com/networking/ral.git /opt/ral && \
ninja && \ ninja && \
ninja install ninja install
COPY . .
FROM ran-base AS ran-build-fhi72 FROM ran-base AS ran-build-fhi72
## Build and install OAI ## Build and install OAI
#run build_oai to build the target image #run build_oai to build the target image
......
...@@ -12,7 +12,6 @@ ENV TZ=Europe ...@@ -12,7 +12,6 @@ ENV TZ=Europe
RUN rm -Rf /oai-ran RUN rm -Rf /oai-ran
WORKDIR /oai-ran WORKDIR /oai-ran
COPY . .
ARG xran_VERSION=11.1.1 ARG xran_VERSION=11.1.1
...@@ -31,6 +30,8 @@ RUN git clone https://github.com/openairinterface/o-du-phy.git /opt/phy && \ ...@@ -31,6 +30,8 @@ RUN git clone https://github.com/openairinterface/o-du-phy.git /opt/phy && \
cd /opt/phy/fhi_lib/lib && \ cd /opt/phy/fhi_lib/lib && \
WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-24.11.4/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-24.11.4/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1
COPY . .
FROM ran-base AS ran-build-fhi72 FROM ran-base AS ran-build-fhi72
ARG E2AP_VERSION=E2AP_V3 ARG E2AP_VERSION=E2AP_V3
ARG KPM_VERSION=KPM_V3_00 ARG KPM_VERSION=KPM_V3_00
......
...@@ -27,7 +27,7 @@ RUN apt-get update && \ ...@@ -27,7 +27,7 @@ RUN apt-get update && \
RUN rm -Rf /oai-ran RUN rm -Rf /oai-ran
WORKDIR /oai-ran WORKDIR /oai-ran
COPY . .
## Copy T2 patch ## Copy T2 patch
COPY ./$T2_PATCH /opt/. COPY ./$T2_PATCH /opt/.
## Download and build DPDK ## Download and build DPDK
...@@ -46,6 +46,8 @@ RUN git clone https://github.com/openairinterface/o-du-phy.git /opt/phy && \ ...@@ -46,6 +46,8 @@ RUN git clone https://github.com/openairinterface/o-du-phy.git /opt/phy && \
cd /opt/phy/fhi_lib/lib && \ cd /opt/phy/fhi_lib/lib && \
WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-$DPDK_VERSION/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-$DPDK_VERSION/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1
COPY . .
FROM ran-base AS ran-build-fhi72-t2 FROM ran-base AS ran-build-fhi72-t2
## Build and install OAI ## Build and install OAI
## Run build_oai to build the target image, if T2 patch present, build with T2 support ## Run build_oai to build the target image, if T2 patch present, build with T2 support
......
...@@ -32,7 +32,6 @@ RUN apt-get update && \ ...@@ -32,7 +32,6 @@ RUN apt-get update && \
RUN rm -Rf /oai-ran RUN rm -Rf /oai-ran
WORKDIR /oai-ran WORKDIR /oai-ran
COPY . .
RUN git clone https://github.com/CESNET/libyang.git && \ RUN git clone https://github.com/CESNET/libyang.git && \
cd libyang && \ cd libyang && \
...@@ -81,6 +80,8 @@ RUN git clone https://github.com/openairinterface/o-du-phy.git /opt/phy && \ ...@@ -81,6 +80,8 @@ RUN git clone https://github.com/openairinterface/o-du-phy.git /opt/phy && \
cd /opt/phy/fhi_lib/lib && \ cd /opt/phy/fhi_lib/lib && \
WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-24.11.4/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-24.11.4/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1
COPY . .
FROM ran-base AS ran-build-fhi72 FROM ran-base AS ran-build-fhi72
## Build and install OAI ## Build and install OAI
#run build_oai to build the target image #run build_oai to build the target image
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment