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.

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

Patch python instead of grass for alpine docker #304

Merged
merged 1 commit into from
Jan 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions docker/alpine/Dockerfile_alpine
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,11 @@ RUN echo "Install main packages";\
# Copy and install GRASS GIS
COPY . /src/grass_build/
WORKDIR /src/grass_build/
# PATCH ctypes
COPY docker/alpine/alpine-py38-ctypes.patch /src/alpine-py38-ctypes.patch
RUN patch -p1 < /src/alpine-py38-ctypes.patch

# Python 3.8.1 patch
RUN apk add curl
RUN curl -L https://github.com/mmacata/alpine-python381-patch/releases/download/0.0.0/python3-dev-3.8.1-r1.apk > /src/python3-dev-3.8.1-r1.apk
RUN apk add --allow-untrusted /src/python3-dev-3.8.1-r1.apk

# Configure compile and install GRASS GIS
RUN echo " => Configure and compile grass" && \
Expand Down Expand Up @@ -195,6 +197,11 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
pdal --version && \
python3 --version

# Python 3.8.1 patch again
RUN apk add curl
RUN curl -L https://github.com/mmacata/alpine-python381-patch/releases/download/0.0.0/python3-3.8.1-r1.apk > /src/python3-3.8.1-r1.apk
RUN apk add --allow-untrusted /src/python3-3.8.1-r1.apk


FROM grass as test

Expand All @@ -205,6 +212,9 @@ COPY docker/testdata/test_grass_session.py .
## just scan the LAZ file
# TODO: fix test
#RUN /usr/bin/python3 /scripts/test_grass_session.py
# Test addon installation
RUN apk add make gcc
RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.learn.ml


FROM grass as final
Expand Down
34 changes: 0 additions & 34 deletions docker/alpine/alpine-py38-ctypes.patch

This file was deleted.