Skip to content

Commit

Permalink
Remove unused dependencies from mingw docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
manisandro committed Sep 7, 2021
1 parent 4ff1e55 commit 898967e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/mingw64.yml
Expand Up @@ -69,6 +69,7 @@ jobs:
run: |
mkdir -p ${GITHUB_WORKSPACE}/.ccache
docker run \
--security-opt seccomp=unconfined \
--env CCACHE_DIR=/QGIS/.ccache \
-w /QGIS \
-v ${GITHUB_WORKSPACE}:/QGIS \
Expand Down
8 changes: 0 additions & 8 deletions ms-windows/mingw/qgis3-build-deps-mingw.dockerfile
Expand Up @@ -7,23 +7,18 @@ MAINTAINER Sandro Mani <manisandro@gmail.com>
RUN \
echo all > /etc/rpm/macros.image-language-conf && \
rm -f /etc/yum.repos.d/*modular* && \
dnf install -y --nogpgcheck 'dnf-command(config-manager)' && \
dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/smani/mingw-extras/repo/fedora-rawhide/smani-mingw-extras-fedora-rawhide.repo && \
dnf install -y --nogpgcheck \
mingw64-dlfcn \
mingw64-exiv2 \
ccache \
mingw64-gcc-c++ \
mingw64-gdal \
mingw64-gdb \
mingw64-GdbCrashHandler \
mingw64-GeographicLib \
mingw64-geos \
mingw64-gsl \
mingw64-libgomp \
mingw64-libzip \
mingw64-osgearth-qt5 \
mingw64-pacparser \
mingw64-postgresql \
mingw64-proj \
mingw64-python3 \
Expand Down Expand Up @@ -93,8 +88,5 @@ dnf install -y --nogpgcheck \
xorg-x11-server-Xvfb \
zip

RUN wget https://pkg.sourcepole.ch/kadas/mingw64-librsvg2-2.40.11-1.fc28.noarch.rpm
RUN dnf install -y mingw64-librsvg2-2.40.11-1.fc28.noarch.rpm

WORKDIR /workspace
VOLUME ["/workspace"]

0 comments on commit 898967e

Please sign in to comment.