Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update qgis versions and remove unused stuff in dockerfile #910

Merged
merged 3 commits into from
May 22, 2024
Merged

update qgis versions and remove unused stuff in dockerfile #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fb19b7
update qgis versions and remove unused stuff in dockerfile
signedav May 22, 2024
c034e91
use official images again (what are now the old opengisch images
signedav May 22, 2024
c09e98f
use same dockerfile content like in the model baker libery repo
signedav May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 8 additions & 23 deletions .docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,18 @@
ARG QGIS_TEST_VERSION=latest
FROM opengisch/qgis:${QGIS_TEST_VERSION}
MAINTAINER Matthias Kuhn <matthias@opengis.ch>

# remove QGIS apt repo to avoid signing key issues
RUN add-apt-repository -r https://qgis.org/ubuntu && \
add-apt-repository -r https://qgis.org/ubuntu-ltr
FROM qgis/qgis:${QGIS_TEST_VERSION}

RUN apt-get update && \
apt-get -y install openjdk-8-jre curl locales \
python3-pip \
apt-get -y install openjdk-8-jre \
&& rm -rf /var/lib/apt/lists/*

# MSSQL: client side
RUN apt-get update
RUN apt-get install -y unixodbc unixodbc-dev odbcinst odbcinst1debian2 libodbc1 libqt5sql5-odbc
RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
RUN curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
RUN apt-get update
RUN ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools
# Useful only in 3.22 and 3.28: drop when not need anymore
RUN apt-get update && apt-get -y install python3-pip python3-venv python3-pytest python3-wheel

ENV VIRTUAL_ENV=/opt/venv
RUN python3 -m venv --system-site-packages $VIRTUAL_ENV
ENV PATH="$VIRTUAL_ENV/bin:$PATH"

COPY ./requirements.txt /tmp/
RUN pip3 install -r /tmp/requirements.txt

# Avoid sqlcmd termination due to locale -- see https://github.com/Microsoft/mssql-docker/issues/163
RUN echo "nb_NO.UTF-8 UTF-8" > /etc/locale.gen
RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
RUN locale-gen
ENV PATH="/usr/local/bin:${PATH}"

ENV LANG=C.UTF-8

WORKDIR /
2 changes: 1 addition & 1 deletion .docker/run-docker-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ set -e

pushd /usr/src
DEFAULT_PARAMS='-v'
xvfb-run pytest-3 ${@:-`echo $DEFAULT_PARAMS`} $1
xvfb-run python -m pytest ${@:-`echo $DEFAULT_PARAMS`} $1 $2
popd
4 changes: 2 additions & 2 deletions .github/workflows/continuous_integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
test:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
fail-fast: false # keep for now, since 3.22 and 3.28 have different bases than 3.34+
matrix:
qgis_version: [3.22-jammy, 3.28-jammy, latest]
qgis_version: [release-3_22, release-3_28, 3.34, latest]
env:
QGIS_TEST_VERSION: ${{ matrix.qgis_version }}
steps:
Expand Down