openinfra/refstack
Code Issues Proposed changes

Make run-in-docker script use Xenial

Browse Source 
This will allow us to run Py35 tests while testing in the container

Change-Id: Ia95262c37a9eb843b8afdedf6e9adf76a9f5641f
This commit is contained in:
Megan Guiney 2018-01-04 15:32:34 -08:00
parent 33eb6586cf
commit ac57d50f42
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/Dockerfile
View File

@ -1,4 +1,6 @@
FROM ubuntu:14.04
FROM ubuntu:16.04
RUN apt update && apt install -y sudo
RUN \
groupadd dev && \
@ -8,12 +10,11 @@ RUN \
ENV DEBIAN_FRONTEND noninteractive
RUN \
apt-get update && \
apt-get -y install \
apt -y install \
sudo git vim wget \
nginx \
python-dev python3-dev python-pip \
libmysqlclient-dev mysql-client-5.6 mysql-server-5.6 libffi-dev\
libmysqlclient-dev mysql-client mysql-server libffi-dev\
npm && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /var/lib/mysql/* && \

4
docker/scripts/api-init-db
View File

@ -1,5 +1,7 @@
#!/bin/bash
[[ ${DEBUG_MODE} ]] && set -x
mysql --no-defaults -S ${SQL_DIR}/mysql.socket -e 'CREATE DATABASE refstack;'
mysql --no-defaults -S ${SQL_DIR}/mysql.socket -e 'set @@global.show_compatibility_56=ON;'
cd /home/dev/refstack
.venv/bin/python bin/refstack-manage upgrade --revision head
.venv/bin/python bin/refstack-manage upgrade --revision head