From 2f127c91b9a12bd7131218f11a89aee83ec1c52e Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 14 Oct 2020 15:03:31 +0000 Subject: [PATCH] Fix bug 1262 - Updated requirements to use mysqlclient Docker base image updated to ubuntu1804 for deb pkg generation Change-Id: I9b26a07df5190ac4563cb9b2a1c73b79361c8054 Signed-off-by: garciadeblas --- Dockerfile | 24 ++++++++++++++++++------ requirements.txt | 17 +++++++++++++++-- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2cb64d0..7b28d4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,23 @@ +# Copyright 2020 ETSI +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This Dockerfile is intented for devops and deb package generation # -# Use Dockerfile.local for running osm/NBI in a docker container from source -# Use Dockerfile.fromdeb for running osm/NBI in a docker container from last stable package - +# Use docker/Dockerfile for running osm/LW-UI in a docker container from source -FROM ubuntu:16.04 +FROM ubuntu:18.04 -RUN apt-get update && apt-get -y install git make libcurl4-gnutls-dev \ - libgnutls-dev debhelper apt-utils dh-make +RUN apt-get update && apt-get -y install git make debhelper apt-utils dh-make diff --git a/requirements.txt b/requirements.txt index cdc3eb7..a7c9a9a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,16 @@ +## +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## decorator==4.0.10 Django==1.11.18 django-model-utils==2.6 @@ -13,5 +26,5 @@ six==1.10.0 smmap2==2.0.3 url==0.2.0 wheel==0.24.0 -mysql-python -sqlalchemy +mysqlclient==1.4.6 +sqlalchemy==1.3.20 -- 2.17.1