diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2 index 7517cae809..11cfdc1dde 100644 --- a/installer/roles/image_build/templates/Dockerfile.j2 +++ b/installer/roles/image_build/templates/Dockerfile.j2 @@ -28,6 +28,7 @@ ADD RPM-GPG-KEY-ansible-release /etc/pki/rpm-gpg/RPM-GPG-KEY-ansible-release WORKDIR /tmp RUN mkdir -p /var/lib/awx/public/static RUN chgrp -Rf root /var/lib/awx && chmod -Rf g+w /var/lib/awx +# sync with tools/docker-compose/Dockerfile RUN yum -y install epel-release && \ yum -y localinstall https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm && \ yum -y update && \ diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 061773a9e5..248d2beda7 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -6,18 +6,14 @@ ADD Makefile /tmp/Makefile RUN mkdir /tmp/requirements -RUN yum -y update && yum -y install curl epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm -RUN yum -y localinstall https://download.postgresql.org/pub/repos/yum/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-3.noarch.rpm -RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - +RUN yum -y update && yum -y install epel-release +RUN yum -y localinstall https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-redhat96-9.6-3.noarch.rpm -RUN yum -y update && yum -y install openssh-server ansible mg vim tmux \ - git2u-core mercurial subversion python-devel python-pip python36 python36-devel python-psycopg2 make postgresql \ - postgresql-devel nginx nodejs python-psutil libxml2-devel libxslt-devel \ - libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel \ - xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 \ - xmlsec1-openssl-devel libtool-ltdl-devel rabbitmq-server bubblewrap \ - zanata-python-client gettext gcc-c++ libcurl-devel bzip2 \ - rsync +# sync with installer/roles/image_build/templates/Dockerfile.j2 +RUN yum -y install ansible git mercurial subversion curl python-psycopg2 python-pip python-setuptools libselinux-python setools-libs yum-utils sudo acl make postgresql-devel nginx python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap gcc-c++ python-devel python36-setuptools python36-devel krb5-workstation krb5-libs libcurl-devel rsync unzip + +RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - +RUN yum -y install nodejs openssh-server tmux vim mg RUN python3 -m ensurepip RUN pip3 install virtualenv @@ -47,7 +43,10 @@ RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/ngi WORKDIR /tmp RUN mkdir -p /venv && chmod g+w /venv -RUN CFLAGS="-DXMLSEC_NO_SIZE_T" SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" VENV_BASE="/venv" make requirements_dev +RUN CFLAGS="-DXMLSEC_NO_SIZE_T" VENV_BASE="/venv" make requirements_dev +RUN yum -y remove gcc postgresql-devel libxml2-devel libxslt-devel cyrus-sasl-devel openldap-devel xmlsec1-devel krb5-devel xmlsec1-openssl-devel libtool-ltdl-devel gcc-c++ python-devel python36-devel +RUN yum -y clean all +RUN rm -rf /root/.cache RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en