openinfra
/
refstack
Code Issues Proposed changes

Merge "Make run-in-docker script use Xenial"

This commit is contained in:
Zuul 2018-01-09 22:54:20 +00:00 committed by Gerrit Code Review
parent d7d0007f18 ac57d50f42
commit 2afff3094a
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 \ RUN \
groupadd dev && \ groupadd dev && \
@ -8,12 +10,11 @@ RUN \
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN \ RUN \
apt-get update && \ apt -y install \
apt-get -y install \
sudo git vim wget \ sudo git vim wget \
nginx \ nginx \
python-dev python3-dev python-pip \ 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 && \ npm && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
rm -rf /var/lib/mysql/* && \ rm -rf /var/lib/mysql/* && \

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

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