Skip to content

Commit

Permalink
Switch to using openSUSE Leap 42.2
Browse files Browse the repository at this point in the history
Downgrades:

- lua 5.3 to 5.1
- ruby 2.2 to 2.1

De-activate GoTypeBear due to openSUSE packaging bugs.

Fixes coala#144
  • Loading branch information
jayvdb committed Mar 30, 2017
1 parent 0641cd8 commit ee6fd0f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 27 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ script:
cd /coala-bears;
rm bears/Constants.py; # There are no tests covering this module
rm bears/c_languages/CSharpLintBear.py tests/c_languages/CSharpLintBearTest.py;
rm bears/go/GoTypeBear.py tests/go/GoTypeBearTest.py;
rm bears/java/InferBear.py tests/java/InferBearTest.py;
rm bears/haskell/GhcModBear.py tests/haskell/GhcModBearTest.py;
rm -r bears/verilog tests/verilog/;
Expand Down
42 changes: 15 additions & 27 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM opensuse:tumbleweed
FROM opensuse:leap
MAINTAINER Fabian Neuschmidt [email protected]

ARG branch=master
Expand All @@ -10,20 +10,21 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en PATH=$PATH:/root/pmd-bin-5.4.1/bin:/root/
RUN mkdir -p /root/.local/share/coala && \
ln -s /root/.local/share/coala /cache

# Add packaged flawfinder
RUN zypper addrepo http://download.opensuse.org/repositories/home:illuusio/openSUSE_Tumbleweed/home:illuusio.repo && \
RUN \
# Use Leap for nodejs
zypper addrepo http://download.opensuse.org/repositories/devel:languages:nodejs/openSUSE_Leap_42.2/devel:languages:nodejs.repo && \
# Add repo for rubygem-bundler
zypper addrepo http://download.opensuse.org/repositories/home:AtastaChloeD:ChiliProject/openSUSE_Factory/home:AtastaChloeD:ChiliProject.repo && \
# Remove unnecessary repos to avoid refreshes
zypper removerepo 'NON-OSS' && \
zypper removerepo 'NON-OSS' 'Update Non-Oss' && \
# Package dependencies
time zypper --no-gpg-checks --non-interactive \
# science contains latest Julia
--plus-repo http://download.opensuse.org/repositories/science/openSUSE_Tumbleweed/ \
--plus-repo http://download.opensuse.org/repositories/science/openSUSE_Leap_42.2/ \
# luarocks
--plus-repo http://download.opensuse.org/repositories/devel:languages:lua/openSUSE_Tumbleweed/ \
--plus-repo http://download.opensuse.org/repositories/home:malkavi/openSUSE_Leap_42.2/ \
# flawfinder
--plus-repo http://download.opensuse.org/repositories/home:illuusio/openSUSE_Leap_42.2 \
# clang
--plus-repo http://download.opensuse.org/repositories/devel:tools:compiler/openSUSE_Leap_42.2/ \
install \
bzr \
cppcheck \
Expand Down Expand Up @@ -53,8 +54,8 @@ RUN zypper addrepo http://download.opensuse.org/repositories/home:illuusio/openS
devscripts \
# linux-glibc-devel needed for Ruby native extensions
linux-glibc-devel \
lua \
lua-devel \
lua51 \
lua51-devel \
luarocks \
m4 \
nodejs \
Expand All @@ -77,7 +78,7 @@ RUN zypper addrepo http://download.opensuse.org/repositories/home:illuusio/openS
R-base \
ruby \
ruby-devel \
ruby2.2-rubygem-bundler \
ruby2.1-rubygem-bundler \
ShellCheck \
subversion \
tar \
Expand All @@ -87,14 +88,10 @@ RUN zypper addrepo http://download.opensuse.org/repositories/home:illuusio/openS
aaa_base \
cron \
cronie \
dbus-1 \
fdupes \
fontconfig \
fonts-config \
kbd \
iproute2 \
kmod \
libasan3 \
libdrm_amdgpu1 \
libdrm_intel1 \
libdrm_nouveau2 \
Expand All @@ -121,19 +118,11 @@ RUN zypper addrepo http://download.opensuse.org/repositories/home:illuusio/openS
openslp \
perl-File-ShareDir \
perl-Net-DBus \
perl-Pod-Coverage \
perl-Test-Pod \
perl-Test-Pod-Coverage \
perl-X11-Protocol \
postfix \
php7-zlib \
python-cssselect \
python-curses \
python-javapackages \
python-lxml \
python-Pygments \
python-pyxb \
python-rpm-macros \
python-xml \
R-core-doc \
rsync \
Expand All @@ -143,15 +132,12 @@ RUN zypper addrepo http://download.opensuse.org/repositories/home:illuusio/openS
syslog-service \
systemd \
systemd-presets-branding-openSUSE \
texlive-gsftopk \
texlive-gsftopk-bin \
texlive-kpathsea \
texlive-kpathsea-bin \
texlive-tetex-bin \
texlive-texconfig \
texlive-texconfig-bin \
texlive-texlive.infra \
texlive-updmap-map \
util-linux-systemd \
wicked \
wicked-service \
Expand Down Expand Up @@ -241,7 +227,8 @@ RUN source /etc/profile.d/go.sh && time go get -u \
github.com/golang/lint/golint \
golang.org/x/tools/cmd/goimports \
sourcegraph.com/sqs/goreturns \
github.com/jayvdb/gotype \
# See https://github.com/coala/docker-coala-base/issues/144
# github.com/jayvdb/gotype \
github.com/kisielk/errcheck && \
find /tmp -mindepth 1 -prune -exec rm -rf '{}' '+'

Expand Down Expand Up @@ -272,6 +259,7 @@ RUN source /etc/profile.d/go.sh && time go get -u \
# ENV PATH=$PATH:/home/opam/infer-linux64-v0.9.0/infer/bin

# Julia setup
# https://github.com/coala/docker-coala-base/issues/144
RUN time julia -e 'Pkg.add("Lint")' && \
rm -rf \
~/.julia/.cache \
Expand Down

0 comments on commit ee6fd0f

Please sign in to comment.