From 886df7c65a21a94616fe6167963f764e037b4655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Fri, 19 Jun 2020 09:41:20 +0200
Subject: [PATCH] change docker image to a ubuntu base
---
.docker/Dockerfile | 53 ++++++++++++++++++++++++++++++++--------------
1 file changed, 37 insertions(+), 16 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 914e5f61..778a0701 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,19 +1,40 @@
-FROM debian:latest
-RUN apt-get update && \
- apt-get install \
- curl \
- python3 \
- python3-pip \
- python3-requests \
- python3-pandas \
- python3-html2text \
- tox \
- git \
- openjdk-11-jdk-headless \
- python-autopep8 \
- python3-pytest \
- libxml2 \
- -y
+# Use docker as parent image
+FROM ubuntu:20.04
+
+# http://bugs.python.org/issue19846
+ENV LANG C.UTF-8
+
+# install dependencies
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ acl \
+ docker.io \
+ python3-pip \
+ python3.6 \
+ python3.7 \
+ python3.8 \
+ python3-dev \
+ gcc \
+ make \
+ git \
+ bash \
+ curl \
+ gettext \
+ python3-requests \
+ python3-packaging\
+ libffi-dev \
+ #openssl-dev \
+ libc-dev \
+ libxslt1.1 \
+ libxslt-dev \
+ libxml2 \
+ libxml2-dev \
+ openjdk-14-jre-headless \
+ openssl
+
+RUN pip3 install docker-compose==1.25 pytest-shell
+
+RUN mkdir -p /opt/caosdb/build_docker/
+
COPY .docker/wait-for-it.sh /wait-for-it.sh
ADD https://gitlab.com/api/v4/projects/13656973/repository/branches/master \
pylib_version.json
--
GitLab