Skip to content

Commit

Permalink
Fix for the review.
Browse files Browse the repository at this point in the history
  • Loading branch information
junaruga committed Jul 30, 2018
1 parent d697180 commit b3da64b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
17 changes: 17 additions & 0 deletions .travis_Dockerfile_centos
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,21 @@ FROM centos:7
WORKDIR /build
COPY . .

RUN yum -y update
RUN yum -y install epel-release
# The options are to install faster.
RUN yum -y install \
--setopt=deltarpm=0 \
--setopt=install_weak_deps=false \
--setopt=tsflags=nodocs \
mariadb-server \
mariadb-devel \
ruby-devel \
git \
gcc \
gcc-c++ \
make
RUN gem update --system > /dev/null
RUN gem install bundler

CMD sh .travis_centos.sh
2 changes: 1 addition & 1 deletion .travis_centos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eux

# Install dependency packages and start mysqld service.
# Start mysqld service.
sh .travis_setup_centos.sh

bundle install --path vendor/bundle --without benchmarks development
Expand Down
17 changes: 0 additions & 17 deletions .travis_setup_centos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,6 @@

set -eux

yum -y update
yum -y install epel-release
# The options are to install faster.
yum -y install \
--setopt=deltarpm=0 \
--setopt=install_weak_deps=false \
--setopt=tsflags=nodocs \
mariadb-server \
mariadb-devel \
ruby-devel \
git \
gcc \
gcc-c++ \
make
gem update --system > /dev/null
gem install bundler

MYSQL_TEST_LOG="$(pwd)/mysql.log"

mysql_install_db \
Expand Down

0 comments on commit b3da64b

Please sign in to comment.