Use openSUSE Leap 15.1 in the development Dockerfile

openSUSE · Oct 29, 2019 · 02069de · 02069de
1 parent ab61728
commit 02069de
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,16 @@
-FROM opensuse/leap:42.3
+FROM opensuse/leap:15.1
 
 RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
-  ruby ruby-devel ruby2.1-rubygem-bundler libxml2-devel libxslt-devel \
-  postgresql-devel sqlite3-devel libqt4-devel libmysqlclient-devel libQtWebKit-devel \
-  gcc gcc-c++ make tar gzip patch timezone && \
+  ruby ruby-devel ruby2.5-rubygem-bundler libxml2-devel libxslt-devel \
+  postgresql-devel sqlite3-devel libmysqlclient-devel \
+  libQt5WebKit5 libQt5WebKit5-devel libQt5WebKitWidgets5 libQt5WebKitWidgets-devel \
+  xvfb-run which liberation-fonts gcc gcc-c++ make tar gzip patch timezone && \
   zypper clean -a
 
 RUN mkdir /app
 WORKDIR /app
 COPY . /app
+ENV QMAKE=/usr/bin/qmake-qt5
 RUN bundle install
 
 CMD ["rails", "server", "-b", "0.0.0.0"]
diff --git a/doc/DOCKER.md b/doc/DOCKER.md
@@ -27,7 +27,7 @@ straighforward.
 
 5. (Optional) Run the testsuite to find out whether the application works.
 
-        docker-compose run --rm web rake spec
+        docker-compose run --rm web xvfb-run -a rake spec
 
 6. And, now, you can start the application:
 

diff --git a/docker/docker-compose.mysql.yml b/docker/docker-compose.mysql.yml
@@ -5,14 +5,10 @@ services:
     build: .
     volumes:
       - .:/app
-      - /tmp/.X11-unix:/tmp/.X11-unix
-      - ~/.Xauthority:/root/.Xauthority
     ports:
       - "3000:3000"
     depends_on:
       - db
-    environment:
-      DISPLAY: "${DISPLAY}"
   db:
     image: mysql:5.6
     restart: always

diff --git a/docker/docker-compose.postgresql.yml b/docker/docker-compose.postgresql.yml
@@ -5,14 +5,10 @@ services:
     build: .
     volumes:
       - .:/app
-      - /tmp/.X11-unix:/tmp/.X11-unix
-      - ~/.Xauthority:/root/.Xauthority
     ports:
       - "3000:3000"
     depends_on:
       - db
-    environment:
-      DISPLAY: "${DISPLAY}"
   db:
     image: postgres:9.6
     restart: always
diff --git a/docker/docker-compose.sqlite3.yml b/docker/docker-compose.sqlite3.yml
@@ -5,9 +5,5 @@ services:
     build: .
     volumes:
       - .:/app
-      - /tmp/.X11-unix:/tmp/.X11-unix
-      - ~/.Xauthority:/root/.Xauthority
     ports:
       - "3000:3000"
-    environment:
-      DISPLAY: "${DISPLAY}"