[milter-manager-commit] milter-manager/milter-manager at 6a9fa3a [docker-for-ci] travis: Run rsyslogd before run test

Zurück zum Archiv-Index

Kenji Okimoto null+****@clear*****
Thu Jun 15 10:28:46 JST 2017


Kenji Okimoto	2017-04-06 15:06:49 +0900 (Thu, 06 Apr 2017)

  New Revision: 6a9fa3a5ead9a5a02447776e3849f1244d09dfc3
  https://github.com/milter-manager/milter-manager/commit/6a9fa3a5ead9a5a02447776e3849f1244d09dfc3

  Message:
    travis: Run rsyslogd before run test
    
    Because test needs runnnig rsyslogd.

  Modified files:
    .travis.yml
    dockerfiles/Dockerfile-ubuntu-trusty

  Modified: .travis.yml (+1 -0)
===================================================================
--- .travis.yml    2017-04-06 14:00:15 +0900 (21a51d8)
+++ .travis.yml    2017-04-06 15:06:49 +0900 (c56fb29)
@@ -28,6 +28,7 @@ before_script:
   - docker-compose build ${TARGET_DISTRIBUTION}
   - docker-compose ps
   - docker-compose up -d ${TARGET_DISTRIBUTION}
+  - docker-compose exec --user root ${TARGET_DISTRIBUTION} rsyslogd -f /etc/rsyslog.conf
   - docker-compose exec ${TARGET_DISTRIBUTION} ./autogen.sh
   - docker-compose exec ${TARGET_DISTRIBUTION} ./configure --enable-coverage --with-default-connection-spec="inet:10025@[127.0.0.1]"
   - docker-compose exec ${TARGET_DISTRIBUTION} make

  Modified: dockerfiles/Dockerfile-ubuntu-trusty (+1 -2)
===================================================================
--- dockerfiles/Dockerfile-ubuntu-trusty    2017-04-06 14:00:15 +0900 (fefebca)
+++ dockerfiles/Dockerfile-ubuntu-trusty    2017-04-06 15:06:49 +0900 (88f3fd8)
@@ -8,8 +8,7 @@ RUN apt-get update && \
     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 && \
-    useradd -m --user-group --shell /bin/bash milter-manager && \
-    service rsyslog start
+    useradd -m --user-group --shell /bin/bash milter-manager
 
 WORKDIR /home/milter-manager/milter-manager
 COPY . .
-------------- next part --------------
An HTML attachment was scrubbed...
Download 



More information about the milter-manager-commit mailing list
Zurück zum Archiv-Index