airship
/
shipyard
Code Issues Proposed changes

Fix opensuse image build gate 

Gate started to fail with:
    /bin/sh: /usr/bin/python3: Permission denied

Related changes in other projects:
    armada: https://review.opendev.org/#/c/676806/
    pegleg: https://review.opendev.org/#/c/676944/

Change-Id: I66d1ea3af18b7007411d5851df48c61d5d429e17
This commit is contained in:
Evgeny L 2019-08-26 21:20:00 +00:00
parent 9c5f68cf97
commit fed3407634
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
images/airflow/Dockerfile.opensuse_15
View File

@ -64,8 +64,9 @@ RUN set -ex && \
python3-pip \ python3-pip \
python3-devel \ python3-devel \
python3-python-dateutil \ python3-python-dateutil \
make \ make
&& python3 -m pip install -U pip \
RUN pip3 install -U pip \
&& zypper clean -a \ && zypper clean -a \
&& rm -rf \ && rm -rf \
/tmp/* \ /tmp/* \

17
images/shipyard/Dockerfile.opensuse_15
View File

@ -41,6 +41,7 @@ RUN set -ex && \
ca-certificates \ ca-certificates \
curl \ curl \
netcfg \ netcfg \
python3 \
python3-devel \ python3-devel \
python3-setuptools \ python3-setuptools \
&& zypper clean -a \ && zypper clean -a \
@ -69,17 +70,13 @@ COPY ${ctx_base}/shipyard_client /home/shipyard/shipyard_client/
COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/ COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/
# Build # Build
RUN set -ex \ ENV buildDeps="gcc git-core libopenssl-devel make python3-pip"
&& buildDeps=' \ RUN set -ex \
gcc \
git-core \
libopenssl-devel \
make \
python3-pip \
' \
&& zypper -q update -y \ && zypper -q update -y \
&& zypper --non-interactive install --no-recommends $buildDeps \ && zypper --non-interactive install --no-recommends $buildDeps
&& python3 -m pip install -U pip \
RUN set -ex \
&& pip3 install -U pip \
&& pip3 install -r /home/shipyard/client_requirements.txt --no-cache-dir \ && pip3 install -r /home/shipyard/client_requirements.txt --no-cache-dir \
&& cd /home/shipyard/shipyard_client \ && cd /home/shipyard/shipyard_client \
&& python3 setup.py install \ && python3 setup.py install \