Skip to content
Snippets Groups Projects
Commit e6413916 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'fix-orphaned-commit' into 'master'

Restores lost changes when mirror force pushed onto dev

See merge request !27
parents 7fcb2324 3a759032
No related branches found
No related tags found
1 merge request!27Restores lost changes when mirror force pushed onto dev
Loading
Loading
@@ -27,7 +27,9 @@ RUN yum install -y -q \
fakeroot \
python-setuptools \
python-setuptools-devel \
python-devel
python-devel \
ccache \
distcc
 
ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8
Loading
Loading
Loading
Loading
@@ -27,7 +27,9 @@ RUN yum install -y -q \
fakeroot \
python-setuptools \
python-setuptools-devel \
python-devel
python-devel \
ccache \
distcc
 
ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8
Loading
Loading
Loading
Loading
@@ -30,6 +30,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
libssl-dev \
fakeroot \
python-dev \
ccache \
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
Loading
Loading
Loading
Loading
@@ -35,7 +35,9 @@ RUN zypper -q -n install \
python-devel \
python-setuptools \
timezone \
rpmbuild
rpmbuild \
ccache \
distcc
 
# perl-devel python-setuptools-devel
 
Loading
Loading
Loading
Loading
@@ -35,7 +35,9 @@ RUN zypper -q -n install \
python-devel \
python-setuptools \
timezone \
rpmbuild
rpmbuild \
ccache \
distcc
 
# perl-devel python-setuptools-devel
 
Loading
Loading
Loading
Loading
@@ -30,6 +30,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
libssl-dev \
fakeroot \
python-dev \
ccache \
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
Loading
Loading
Loading
Loading
@@ -40,6 +40,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
libssl-dev \
fakeroot \
python-dev \
ccache \
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
Loading
Loading
Loading
Loading
@@ -40,6 +40,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
libssl-dev \
fakeroot \
python-dev \
ccache \
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
Loading
Loading
Loading
Loading
@@ -30,6 +30,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
libssl-dev \
fakeroot \
python-dev \
ccache \
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
Loading
Loading
Loading
Loading
@@ -30,6 +30,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
libssl-dev \
fakeroot \
python-dev \
ccache \
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
Loading
Loading
Loading
Loading
@@ -31,6 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
fakeroot \
python-dev \
python-setuptools \
ccache \
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment