Skip to content

Commit

Permalink
docker: fixed to copy patched openroadm models to base image
Browse files Browse the repository at this point in the history
  • Loading branch information
KazuyaAnazawa authored and ishidawataru committed Jun 20, 2023
1 parent abe3ad0 commit b777922
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions docker/agent.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,19 @@ RUN --mount=type=bind,from=builder,source=/usr/share/debs/sysrepo,target=/src ls
RUN --mount=type=bind,from=builder,source=/usr/share/wheels,target=/usr/share/wheels \
pip install /usr/share/wheels/libyang/*.whl /usr/share/wheels/sysrepo/*.whl

RUN --mount=type=bind,source=sm/openroadm,target=/root/sm/openroadm,rw \
--mount=type=bind,source=patches/openroadm,target=/root/patches \
--mount=type=tmpfs,target=/root/.pc,rw \
cd /root && quilt upgrade && quilt push -a && \
mkdir -p /var/lib/goldstone/yang/or && \
cp -r /root/sm/openroadm/model/* /var/lib/goldstone/yang/or/

COPY yang /var/lib/goldstone/yang/gs/
ENV GS_YANG_REPO /var/lib/goldstone/yang/gs
COPY sm/openconfig/release/models/ /var/lib/goldstone/yang/oc/
ENV OC_YANG_REPO /var/lib/goldstone/yang/oc
COPY sm/openconfig/third_party/ietf/ /var/lib/goldstone/yang/ietf
ENV IETF_YANG_REPO /var/lib/goldstone/yang/ietf
COPY sm/openroadm/model /var/lib/goldstone/yang/or/
ENV OR_YANG_REPO /var/lib/goldstone/yang/or

RUN --mount=type=bind,source=scripts,target=/src \
Expand Down Expand Up @@ -297,12 +303,6 @@ RUN --mount=type=bind,source=scripts/,target=/scripts,rw cp /scripts/operational

FROM base AS xlate-or

RUN --mount=type=bind,source=sm/openroadm,target=/root/sm/openroadm,rw \
--mount=type=bind,source=patches/openroadm,target=/root/patches \
--mount=type=tmpfs,target=/root/.pc,rw \
cd /root && quilt upgrade && quilt push -a && \
cp -r /root/sm/openroadm/model/* /var/lib/goldstone/yang/or

RUN --mount=type=bind,source=src/xlate/openroadm,target=/src,rw pip install /src

RUN mkdir -p /current
Expand Down

0 comments on commit b777922

Please sign in to comment.