Kenji Okimoto
null+****@clear*****
Wed Jun 21 16:49:47 JST 2017
Kenji Okimoto 2017-04-06 10:42:41 +0900 (Thu, 06 Apr 2017) New Revision: 132a4c0ad91a7cd19c3ab0ad1d61cf636b999536 https://github.com/milter-manager/milter-manager/commit/132a4c0ad91a7cd19c3ab0ad1d61cf636b999536 Merged 163db21: Merge pull request #121 from milter-manager/docker-for-ci Message: travis: Organize Dockerfile to run test Because root user cannot pass some tests. Modified files: .travis.yml dockerfiles/Dockerfile-ubuntu-trusty dockerfiles/Dockerfile-ubuntu-xenial dockerfiles/Dockerfile-ubuntu-zesty Modified: .travis.yml (+4 -4) =================================================================== --- .travis.yml 2017-04-06 08:55:34 +0900 (93f6890) +++ .travis.yml 2017-04-06 10:42:41 +0900 (bc9e69c) @@ -13,11 +13,11 @@ env: DOCKER_COMPOSE_VERSION: 1.8.1 matrix: - TARGET_DISTRIBUTION=ubuntu-trusty - #- TARGET_DISTRIBUTION=ubuntu-xenial + - TARGET_DISTRIBUTION=ubuntu-xenial #- TARGET_DISTRIBUTION=ubuntu-zesty - - TARGET_DISTRIBUTION=debian-jessie - - TARGET_DISTRIBUTION=debian-stretch - - TARGET_DISTRIBUTION=debian-sid + # - TARGET_DISTRIBUTION=debian-jessie + # - TARGET_DISTRIBUTION=debian-stretch + # - TARGET_DISTRIBUTION=debian-sid before_install: - sudo rm /usr/local/bin/docker-compose Modified: dockerfiles/Dockerfile-ubuntu-trusty (+6 -2) =================================================================== --- dockerfiles/Dockerfile-ubuntu-trusty 2017-04-06 08:55:34 +0900 (8eb536a) +++ dockerfiles/Dockerfile-ubuntu-trusty 2017-04-06 10:42:41 +0900 (fefebca) @@ -7,7 +7,11 @@ RUN apt-get update && \ intltool lcov git libtool && \ curl -L https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh && \ gem install --no-rdoc --no-ri coveralls-lcov && \ - gem install --no-rdoc --no-ri pkg-config + gem install --no-rdoc --no-ri pkg-config && \ + useradd -m --user-group --shell /bin/bash milter-manager && \ + service rsyslog start -WORKDIR /app +WORKDIR /home/milter-manager/milter-manager COPY . . +RUN chown -R milter-manager:milter-manager . +USER milter-manager Modified: dockerfiles/Dockerfile-ubuntu-xenial (+6 -2) =================================================================== --- dockerfiles/Dockerfile-ubuntu-xenial 2017-04-06 08:55:34 +0900 (05e54d5) +++ dockerfiles/Dockerfile-ubuntu-xenial 2017-04-06 10:42:41 +0900 (bbaccff) @@ -7,7 +7,11 @@ RUN apt-get update && \ intltool lcov git libtool && \ curl https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh && \ gem install --no-rdoc --no-ri coveralls-lcov && \ - gem install --no-rdoc --no-ri pkg-config + gem install --no-rdoc --no-ri pkg-config && \ + useradd -m --user-group --shell /bin/bash milter-manager && \ + systemctl start rsyslog -WORKDIR /app +WORKDIR /home/milter-manager/milter-manager COPY . . +RUN chown -R milter-manager:milter-manager . +USER milter-manager Modified: dockerfiles/Dockerfile-ubuntu-zesty (+6 -2) =================================================================== --- dockerfiles/Dockerfile-ubuntu-zesty 2017-04-06 08:55:34 +0900 (0121457) +++ dockerfiles/Dockerfile-ubuntu-zesty 2017-04-06 10:42:41 +0900 (d82cc9d) @@ -7,7 +7,11 @@ RUN apt-get update && \ intltool lcov git libtool && \ curl -L https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh && \ gem install --no-rdoc --no-ri coveralls-lcov && \ - gem install --no-rdoc --no-ri pkg-config + gem install --no-rdoc --no-ri pkg-config && \ + useradd -m --user-group --shell /bin/bash milter-manager && \ + systemctl start rsyslog -WORKDIR /app +WORKDIR /home/milter-manager/milter-manager COPY . . +RUN chown -R milter-manager:milter-manager . +USER milter-manager -------------- next part -------------- An HTML attachment was scrubbed...Descargar
