Skip to content

Commit e7c463f

Browse files
authored
docker: copy module_items.xml for g.search.modules (#6578)
1 parent 7361b68 commit e7c463f

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,9 +364,7 @@ RUN make -j $NUMTHREADS distclean || echo "nothing to clean" \
364364
&& make -j $NUMTHREADS \
365365
&& make install && ldconfig \
366366
&& rm -rf /usr/local/grass85/demolocation \
367-
&& cp /usr/local/grass85/gui/wxpython/xml/module_items.xml module_items.xml \
368-
&& mkdir -p /usr/local/grass85/gui/wxpython/xml/ \
369-
&& mv module_items.xml /usr/local/grass85/gui/wxpython/xml/module_items.xml
367+
&& cp /usr/local/grass85/gui/wxpython/xml/module_items.xml module_items.xml
370368

371369
FROM build_grass AS build_grass_with_gui_built
372370
RUN echo "GUI selected, skipping GUI related cleanup"
@@ -482,6 +480,7 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK=1 \
482480

483481
# Copy GRASS, GDAL-GRASS-plugin and compiled dependencies from build image
484482
COPY --link --from=build_grass_plugin /usr/local /usr/local
483+
COPY --link --from=build_grass_plugin /src/grass_build/module_items.xml /usr/local/grass85/gui/wxpython/xml/module_items.xml
485484
# COPY --link --from=datum_grids /tmp/cdn.proj.org/*.tif /usr/share/proj/
486485

487486
# Create generic GRASS lib name regardless of version number

docker/ubuntu/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,9 +364,7 @@ RUN make -j $NUMTHREADS distclean || echo "nothing to clean" \
364364
&& make -j $NUMTHREADS \
365365
&& make install && ldconfig \
366366
&& rm -rf /usr/local/grass85/demolocation \
367-
&& cp /usr/local/grass85/gui/wxpython/xml/module_items.xml module_items.xml \
368-
&& mkdir -p /usr/local/grass85/gui/wxpython/xml/ \
369-
&& mv module_items.xml /usr/local/grass85/gui/wxpython/xml/module_items.xml
367+
&& cp /usr/local/grass85/gui/wxpython/xml/module_items.xml module_items.xml
370368

371369
FROM build_grass AS build_grass_with_gui_built
372370
RUN echo "GUI selected, skipping GUI related cleanup"
@@ -482,6 +480,7 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK=1 \
482480

483481
# Copy GRASS, GDAL-GRASS-plugin and compiled dependencies from build image
484482
COPY --link --from=build_grass_plugin /usr/local /usr/local
483+
COPY --link --from=build_grass_plugin /src/grass_build/module_items.xml /usr/local/grass85/gui/wxpython/xml/module_items.xml
485484
# COPY --link --from=datum_grids /tmp/cdn.proj.org/*.tif /usr/share/proj/
486485

487486
# Create generic GRASS lib name regardless of version number

0 commit comments

Comments
 (0)