Skip to content

Commit

Permalink
Switch to using openSUSE Leap 42.2
Browse files Browse the repository at this point in the history
Leap is more stable than Tumbleweed.
Downgrades ruby 2.2 to 2.1

Fixes coala#144
  • Loading branch information
jayvdb committed Jul 4, 2017
1 parent c8a44cb commit cf28e19
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 22 deletions.
45 changes: 23 additions & 22 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 @@ -14,21 +14,26 @@ ENV LANG=en_US.UTF-8 \
RUN mkdir -p /root/.local/share/coala && \
ln -s /root/.local/share/coala /cache


RUN \
zypper addlock \
postfix \
&& \
# 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 \
# For nodejs6
--plus-repo http://download.opensuse.org/repositories/devel:languages:nodejs/openSUSE_Leap_42.2/ \
# 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_Tumbleweed/ \
# clang
--plus-repo http://download.opensuse.org/repositories/devel:tools:compiler/openSUSE_Leap_42.2/ \
# php7-imagemagick
--plus-repo http://download.opensuse.org/repositories/home:flacco:rtk:php7/openSUSE_Leap_42.2/ \
install \
bzr \
cppcheck \
Expand Down Expand Up @@ -60,8 +65,8 @@ RUN \
devscripts \
# linux-glibc-devel needed for Ruby native extensions
linux-glibc-devel \
lua \
lua-devel \
lua51 \
lua51-devel \
luarocks \
m4 \
nodejs6 \
Expand All @@ -88,7 +93,7 @@ RUN \
R-base \
ruby \
ruby-devel \
ruby2.2-rubygem-bundler \
ruby2.1-rubygem-bundler \
ShellCheck \
subversion \
tar \
Expand All @@ -98,12 +103,13 @@ RUN \
aaa_base \
cron \
cronie \
dbus-1 \
fdupes \
fontconfig \
fonts-config \
kbd \
kmod \
libdrm_amdgpu1 \
libdrm_intel1 \
libdrm_nouveau2 \
libdrm_radeon1 \
libICE6 \
libthai-data \
libxcb1 libxcb-render0 libxcb-shm0 \
Expand All @@ -115,33 +121,27 @@ RUN \
libXmuu1 \
libXrender1 \
libXss1 libXt6 \
lksctp-tools \
logrotate \
ncurses-utils \
openssh \
openslp \
perl-File-ShareDir \
perl-Net-DBus \
perl-Pod-Coverage \
perl-Test-Pod \
perl-Test-Pod-Coverage \
perl-X11-Protocol \
php7-zlib \
python-curses \
python-rpm-macros \
python-Pygments \
python-xml \
R-core-doc \
rsync \
systemd \
texlive-gsftopk \
texlive-gsftopk-bin \
systemd-presets-branding-openSUSE \
texlive-kpathsea \
texlive-kpathsea-bin \
texlive-tetex-bin \
texlive-texconfig \
texlive-texconfig-bin \
texlive-texlive.infra \
texlive-updmap-map \
xhost \
xorg-x11-fonts \
xorg-x11-fonts-core \
Expand Down Expand Up @@ -305,10 +305,11 @@ RUN mkdir -p ~/.RLibrary && \
find /tmp -mindepth 1 -prune -exec rm -rf '{}' '+'

# Tailor (Swift) setup
RUN curl -fsSL -o install.orig https://raw.githubusercontent.com/sleekbyte/tailor/master/script/install.sh

RUN sed 's/read -r CONTINUE < \/dev\/tty/CONTINUE=y/' install.orig > install.sh

RUN \
curl -fsSL -o install.orig \
https://raw.githubusercontent.com/sleekbyte/tailor/master/script/install.sh && \
sed 's/read -r CONTINUE < \/dev\/tty/CONTINUE=y/' install.orig > install.sh && \
time /bin/bash install.sh && \
find /tmp -mindepth 1 -prune -exec rm -rf '{}' '+'

Expand Down
1 change: 1 addition & 0 deletions tests/pytest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ rm bears/Constants.py; # There are no tests covering this module
rm bears/c_languages/CSharpLintBear.py tests/c_languages/CSharpLintBearTest.py;
rm bears/java/InferBear.py tests/java/InferBearTest.py;
rm bears/haskell/GhcModBear.py tests/haskell/GhcModBearTest.py;
rm bears/go/GoTypeBear.py tests/go/GoTypeBearTest.py;
rm -r bears/verilog tests/verilog/;
python3 -m pytest --cov --cov-fail-under=100;

0 comments on commit cf28e19

Please sign in to comment.