Revert "Merge pull request #7432 from mozilla/revert-docker-changes"
Revert for local work and eventual merge, once this is fixed. This reverts commit5307f487a7, reversing changes made to49389bd642.
This commit is contained in:
Philip Cristiano
Родитель
e197216d9a
Коммит
cb51f696df
61
Dockerfile
61
Dockerfile
|
|
@ -1,49 +1,46 @@
|
|||
FROM centos:centos7
|
||||
FROM python:2.7.14-slim-stretch
|
||||
|
||||
# Allow scripts to detect we're running in our own container
|
||||
RUN touch /addons-server-centos7-container
|
||||
RUN touch /addons-server-docker-container
|
||||
|
||||
ADD docker/mysql-community.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
|
||||
ADD docker/nodesource.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-nodesource
|
||||
ADD docker/git.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-git
|
||||
|
||||
# For mysql-python dependencies
|
||||
ADD docker/mysql.repo /etc/yum.repos.d/mysql.repo
|
||||
|
||||
ADD docker/nodesource.repo /etc/yum.repos.d/nodesource.repo
|
||||
# Add nodesource repository and requirements
|
||||
ADD docker/nodesource.gpg.key /etc/pki/gpg/GPG-KEY-nodesource
|
||||
RUN apt-get update && apt-get install -y \
|
||||
gnupg2 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
# ADD docker/nodesource.repo /etc/yum.repos.d/nodesource.repo
|
||||
RUN cat /etc/pki/gpg/GPG-KEY-nodesource | apt-key add -
|
||||
ADD docker/debian-stretch-nodesource-repo /etc/apt/sources.list.d/nodesource.list
|
||||
|
||||
# For git dependencies
|
||||
ADD docker/git.repo /etc/yum.repos.d/git.repo
|
||||
# ADD docker/git.repo /etc/yum.repos.d/git.repo
|
||||
|
||||
# Upgrade git
|
||||
RUN yum install -y \
|
||||
RUN apt-get update && apt-get install -y \
|
||||
# General (dev-) dependencies
|
||||
bash-completion \
|
||||
gcc-c++ \
|
||||
build-essential \
|
||||
curl \
|
||||
make \
|
||||
libjpeg-devel \
|
||||
cyrus-sasl-devel \
|
||||
libxml2-devel \
|
||||
libxslt-devel \
|
||||
zlib-devel \
|
||||
libffi-devel \
|
||||
openssl-devel \
|
||||
python-devel \
|
||||
libjpeg-dev \
|
||||
libsasl2-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
locales \
|
||||
zlib1g-dev \
|
||||
libffi-dev \
|
||||
libssl-dev \
|
||||
python-dev \
|
||||
python-pip \
|
||||
nodejs \
|
||||
npm \
|
||||
# Git, because we're using git-checkout dependencies
|
||||
git \
|
||||
# Dependencies for mysql-python
|
||||
mysql-community-devel \
|
||||
mysql-community-client \
|
||||
mysql-community-libs \
|
||||
epel-release \
|
||||
mysql-client \
|
||||
default-libmysqlclient-dev \
|
||||
swig \
|
||||
gettext \
|
||||
&& yum clean all
|
||||
|
||||
# Install Nodejs (for less, stylus, uglifyjs and others) separately, because
|
||||
# it's part of epel which we just installed above.
|
||||
RUN yum install -y nodejs
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Compile required locale
|
||||
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
|
||||
|
|
@ -53,8 +50,6 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
|
|||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL en_US.UTF-8
|
||||
|
||||
RUN yum install -y python-pip
|
||||
|
||||
COPY . /code
|
||||
WORKDIR /code
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM centos:centos7
|
||||
FROM python:2.7.14-slim-stretch
|
||||
|
||||
# need to compile swig
|
||||
ENV SWIG_FEATURES="-D__x86_64__"
|
||||
|
|
@ -8,33 +8,42 @@ ENV SWIG_FEATURES="-D__x86_64__"
|
|||
ENV OLYMPIA_UID=9500
|
||||
RUN useradd -u ${OLYMPIA_UID} -s /sbin/nologin olympia
|
||||
|
||||
ADD docker/git.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-git
|
||||
ADD docker/epel.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
|
||||
ADD docker/nodesource.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-nodesource
|
||||
# Add nodesource repository and requirements
|
||||
ADD docker/nodesource.gpg.key /etc/pki/gpg/GPG-KEY-nodesource
|
||||
RUN apt-get update && apt-get install -y \
|
||||
gnupg2 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
# ADD docker/nodesource.repo /etc/yum.repos.d/nodesource.repo
|
||||
RUN cat /etc/pki/gpg/GPG-KEY-nodesource | apt-key add -
|
||||
ADD docker/debian-stretch-nodesource-repo /etc/apt/sources.list.d/nodesource.list
|
||||
|
||||
ADD docker/epel.repo /etc/yum.repos.d/
|
||||
ADD docker/git.repo /etc/yum.repos.d/git.repo
|
||||
ADD docker/nodesource.repo /etc/yum.repos.d/nodesource.repo
|
||||
|
||||
RUN yum install -y \
|
||||
gcc-c++ \
|
||||
gettext \
|
||||
RUN apt-get update && apt-get install -y \
|
||||
# General (dev-) dependencies
|
||||
bash-completion \
|
||||
build-essential \
|
||||
curl \
|
||||
libjpeg-dev \
|
||||
libsasl2-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
locales \
|
||||
zlib1g-dev \
|
||||
libffi-dev \
|
||||
libssl-dev \
|
||||
python-dev \
|
||||
python-pip \
|
||||
nodejs \
|
||||
npm \
|
||||
uwsgi \
|
||||
uwsgi-plugin-python \
|
||||
# Git, because we're using git-checkout dependencies
|
||||
git \
|
||||
libffi-devel \
|
||||
libxml2-devel \
|
||||
libxslt-devel \
|
||||
make \
|
||||
mariadb \
|
||||
mariadb-devel \
|
||||
nodejs \
|
||||
openssl-devel \
|
||||
python-devel \
|
||||
swig \
|
||||
uwsgi-2.0.13.1-2.el7 \
|
||||
uwsgi-plugin-python \
|
||||
&& yum clean all \
|
||||
&& curl -sSL https://bootstrap.pypa.io/get-pip.py | python
|
||||
git \
|
||||
# Dependencies for mysql-python
|
||||
mysql-client \
|
||||
default-libmysqlclient-dev \
|
||||
swig \
|
||||
gettext \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Compile required locale
|
||||
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
|
||||
|
|
@ -55,7 +64,13 @@ RUN pip install --no-cache-dir --exists-action=w --no-deps -r requirements/syste
|
|||
&& pip install --no-cache-dir --exists-action=w --no-deps -r requirements/prod_without_hash.txt\
|
||||
&& pip install --no-cache-dir --exists-action=w --no-deps -e .
|
||||
|
||||
RUN echo -e "from olympia.lib.settings_base import *\n\
|
||||
# Link /usr/sbin/uwsgi and /usr/bin/uwsgi to deal with migration from Centos -> Debian
|
||||
RUN ln -s /usr/bin/uwsgi /usr/sbin/uwsgi
|
||||
|
||||
# Fix for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=783738
|
||||
RUN ln -s /usr/lib/python2.7/plat-*/_sysconfigdata_nd.py /usr/lib/python2.7/
|
||||
|
||||
RUN echo "from olympia.lib.settings_base import *\n\
|
||||
STYLUS_BIN = 'node_modules/stylus/bin/stylus'\n\
|
||||
LESS_BIN = 'node_modules/less/bin/lessc'\n\
|
||||
CLEANCSS_BIN = 'node_modules/clean-css-cli/bin/cleancss'\n\
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -1,6 +1,6 @@
|
|||
.PHONY: help docs test test_es test_no_es test_force_db tdd test_failed initialize_db populate_data update_deps update_db update_assets initialize update reindex flake8 shell debug
|
||||
|
||||
IN_DOCKER = $(wildcard /addons-server-centos7-container)
|
||||
IN_DOCKER = $(wildcard /addons-server-docker-container)
|
||||
|
||||
ifneq ($(IN_DOCKER),)
|
||||
SUB_MAKEFILE = Makefile-docker
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
deb http://deb.nodesource.com/node_6.x stretch main
|
||||
deb-src http://deb.nodesource.com/node_6.x stretch main
|
||||
|
|
@ -1,29 +1,52 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1
|
||||
Comment: GPGTools - https://gpgtools.org
|
||||
|
||||
mQINBFQCN9QBEADv5QYOlCWNkI/oKST/GGpQkOZjFY2cbYdHuc2j8kyM4oeNluXq
|
||||
puEYMHOoQvbJ3DFPvsv+jCruL7qjkel9YzaF6e3RN2ystP4YBjxyOT7Bb5EnjNNU
|
||||
6oScQJ50/+RmA4N3wzBrw5+x5KQGBfRU/k7JdDKO6SGY0zzdAo3jqp1nQ9Sf+Fmg
|
||||
hsjDLVZTHorLPV3yPLb37QlvBB2YIRF+dL9l4wPAI/fGyWv+Qs7VlCZTyRAnKGbv
|
||||
qN1LvlYoV9YqxaJYYJW+MQhn4706yNJAFeOZuKejEcnZTd/NBiAR91sVnsXKgW9e
|
||||
yb4TZ7SqkmrJpuKJBpdPr1dgaK8dDmFh9Nlhpz6xZuYcKaDEDa5b3wymnixtwZf2
|
||||
WyboChIlsHDajtXZt34xP9uUge1VHyk1o8AQUzKEpuepxxLnyXArLgvHaLhQnxPA
|
||||
bQB43b4RbWYHPdB16ki2WoZX/DA4YEtfxg8GC3zXC2thMJnFburmts71iiYsxKBc
|
||||
6d7O8415xrErhk2/o2+bRhf+7qBQfW0oxQSEMBYbqP3hvhG1VWc9umjbCfMgHrHo
|
||||
IzI7W+GbRdbSsdpY6JNKuCftVfIKXeXk5FbUUP9NzsG/nyGFORkq9y0AKmocx3TD
|
||||
w9DRG2SmKIKBOG5PQuzuXqsdUaYcFpySXdPNQG2CPtguPhQivw4qM3pQpQARAQAB
|
||||
tCNOb2RlU291cmNlIDxncGctcnBtQG5vZGVzb3VyY2UuY29tPokCOAQTAQIAIgUC
|
||||
VAI31AIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQXdvo1DT6dN2uaA//
|
||||
UwKsmnz4MCH7Jn/vG0OinGQTfSH5uvlH68yOZmKLnhtfiqUq1gZz734S75ExxGP4
|
||||
SGFYeK9CqKFgoGbpjzLLc5kvA7GdDX3E/exEjYa+GrJ9uIOUtaCKstTD5fPVj2Wf
|
||||
TZtK9v1F6iYKyPHdJnSc5p7AxbLZkarF1CPJQWv2iDrg3dO3Oy41aazRwxJe9hvI
|
||||
a//XavnsW2TTeo8qfQ0qrs8vzt8bxJF+PkACmqQfbXAiflCct5XEUbhbX1b8KznP
|
||||
ppd5PLrvRTjHnZi/QRjky0qsUOukGiQhT6iZeiOUcLPeD+f7tA7JBZ08XXRfnLLj
|
||||
mqYbIHPFG4C/AM5RXu5OdCtFrZQsJgGQEeg/UxYEz5qqNljKjRZ8XsmcyeWouKFM
|
||||
LuVr1ORF6crl8lAdT3RujP2MzY8cvxJQesYKdWqk3bPXI7oG/PRReoeN86TqraYO
|
||||
UeTssVlw5lmJtAH+eHt3K6TSjd0rq1RY7xWfttD7L8ECfPmBzbL54MSmKx9MBz+o
|
||||
a9vOWQ2LjIbR/6DEyQiDpGhQTM+r0/SVS/kqR/j0SEHvOql+sn9sK1/qR1h3JtgI
|
||||
6YF4IDXBE9s0RBCLbdxtVf3eAcbOnhkhefMtpURJLdVuU8HhMCiVUlHDUPHIuT5z
|
||||
Lp+avdanIgi8Cnps/DpMI2KigEHW5mmqihXtfKj0jeE=
|
||||
=9Bql
|
||||
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
|
||||
=CLGF
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче