Skip to content

Commit

Permalink
Merge eac5c78 into 31906a9
Browse files Browse the repository at this point in the history
  • Loading branch information
hlin committed Oct 9, 2019
2 parents 31906a9 + eac5c78 commit b1de421
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 43 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ services: docker

matrix:
include:
# https://hub.docker.com/_/fedora/
# will use centos:8 after it released
- env: CONTAINER_IMAGE=fedora:28 TOXENV=py36
- env: CONTAINER_IMAGE=py36 TOXENV=py36

install:
- pip install coveralls
Expand Down
22 changes: 0 additions & 22 deletions .travis/Dockerfile.fedora:28

This file was deleted.

21 changes: 21 additions & 0 deletions .travis/Dockerfile.py36
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM centos:8

WORKDIR /build

# pyscopg2 requires postgresql-devel
# koji requires krb5-devel
# rpm-py-installer (for koji) requires rpm-devel gcc python3-devel
RUN dnf -y install \
gcc \
krb5-devel \
postgresql-devel \
python36 \
python36-devel \
redhat-rpm-config \
rpm-devel

RUN pip3 install --no-cache-dir tox

COPY . .

CMD ["tox"]
34 changes: 16 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
FROM centos:7
FROM centos:8
LABEL \
name="product-listings-manager" \
vendor="product-listings-manager developers" \
license="MIT" \
build-date=""

RUN yum install -y epel-release \
&& yum -y update \
RUN yum -y update \
&& yum -y install \
gcc \
git \
python-pip \
python-flask \
python-psycopg2 \
python-sqlalchemy \
python2-flask-restful \
python2-flask-sqlalchemy \
python2-koji \
&& pip install \
gunicorn \
futures
krb5-devel \
postgresql-devel \
python36 \
python36-devel \
redhat-rpm-config \
rpm-devel \
&& yum -y clean all \
&& rm -rf /var/cache/dnf \
&& rm -rf /tmp/*

WORKDIR /var/www/product-listings-manager

Expand All @@ -27,11 +26,10 @@ COPY .git .git
RUN git reset --hard HEAD \
&& git checkout HEAD

# Clean up.
RUN yum -y remove git \
&& yum -y clean all \
&& rm -rf /var/cache/yum \
&& rm -rf /tmp/*
RUN pip3 install --no-cache-dir \
-r requirements.txt \
gunicorn \
futures

ARG cacert_url
RUN if [ -n "$cacert_url" ]; then \
Expand Down

0 comments on commit b1de421

Please sign in to comment.