Skip to content

Commit

Permalink
Remove some Ekos dependencies from builder
Browse files Browse the repository at this point in the history
  • Loading branch information
TallFurryMan authored and knro committed Dec 4, 2020
1 parent 451ac59 commit 247eb3d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stages:
- build
- test

image: tallfurryman/kstars-ci:latest
image: tallfurryman/kstars-ci:0.7

variables:
CCACHE_BASEDIR: "$CI_PROJECT_DIR"
Expand Down
2 changes: 2 additions & 0 deletions appimage/appimage-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ AppDir:
include:
- frameworkintegration
- kimageformat-plugins
- kio
- libbz2-1.0
- libcanberra-pulse
- libcfitsio5
Expand Down Expand Up @@ -80,6 +81,7 @@ AppDir:
- libkf5widgetsaddons5
- libkf5windowsystem5
- libkf5xmlgui5
- libkf5auth5
- liblz4-1
- libopenexr22
- libpciaccess0
Expand Down
11 changes: 1 addition & 10 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,12 @@ RUN apt update && apt -y install --no-install-recommends \
zlib1g-dev \
libcfitsio-dev \
libnova-dev \
libindi-dev \
indi-bin \
wcslib-dev \
libraw-dev \
libgsl-dev \
phonon4qt5-backend-vlc \
qt5keychain-dev \
libsecret-1-dev \
libstellarsolver
libsecret-1-dev

# Suitable for tests
RUN apt update && add-apt-repository ppa:mutlaqja/indinightly
Expand All @@ -54,8 +51,6 @@ RUN apt update && apt -y --no-install-recommends install \
astrometry.net \
kded5 \
kinit \
libindi1 \
indi-bin \
breeze-icon-theme \
libqt5sql5-sqlite \
qml-module-qtquick-controls \
Expand Down Expand Up @@ -92,9 +87,5 @@ RUN apt install -y --no-install-recommends \
libsaxon-java \
openjdk-11-jre-headless

# StellarSolver
RUN apt install -y --no-install-recommends \
libstellarsolver-dev

CMD /bin/bash

0 comments on commit 247eb3d

Please sign in to comment.