Skip to content

Commit

Permalink
Merge pull request #79 from geoCML/fix-ci-passed-0.1.1
Browse files Browse the repository at this point in the history
Fix CI build issues
  • Loading branch information
TristanDamron authored Aug 15, 2024
2 parents 025e04f + 64609f9 commit 33a96d6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 15 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ name: CI
on:
# Triggers the workflow on push or pull request events but only for the develop branch
push:
branches: [ main ]
branches: [main]
paths-ignore:
- '.gitignore'
- 'LICENSE.md'
- 'README.md'
- ".gitignore"
- "LICENSE.md"
- "README.md"
pull_request:
branches: [ main ]
branches: [main]
paths-ignore:
- '.gitignore'
- 'LICENSE.md'
- 'README.md'
- ".gitignore"
- "LICENSE.md"
- "README.md"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
12 changes: 5 additions & 7 deletions Dockerfiles/Dockerfile.geocml-desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
FROM ubuntu:22.04

ARG DEBIAN_FRONTEND=noninteractive
RUN apt update

RUN useradd -d /home/user -m user

# Install xpra
ARG DEBIAN_FRONTEND=noninteractive
RUN apt install -y wget gnupg xvfb x11-xserver-utils python3 python3-pip \
&& pip3 install pyinotify \
&& echo "deb [arch=amd64] https://xpra.org/ focal main" > /etc/apt/sources.list.d/xpra.list \
&& wget -q https://xpra.org/gpg.asc -O- | apt-key add - \
&& apt update \
&& apt install -y xpra --no-install-recommends --no-install-suggests
RUN apt install -y wget gnupg xvfb x11-xserver-utils
RUN wget -q https://xpra.org/gpg.asc -O- | apt-key add -
RUN apt update
RUN apt install -y xpra --no-install-recommends --no-install-suggests

# Install QGIS
RUN apt install -y qgis
Expand Down

0 comments on commit 33a96d6

Please sign in to comment.