Browse Source

Update Dockerfile

Zed 6 years ago
parent
commit
0a8cf7e161
3 changed files with 8 additions and 4 deletions
  1. 1 1
      .travis.yml
  2. 3 3
      Dockerfile
  3. 4 0
      start.sh

+ 1 - 1
.travis.yml

@@ -69,4 +69,4 @@ jobs:
         - docker run -d -p 127.0.0.1:8080:8080/tcp $IMAGE_NAME:$TRAVIS_COMMIT
         - sleep 10
         - cd tests
-        - pytest --headless -n 8 --reruns 10 --reruns-delay 2
+        - pytest --headless -n 8 --reruns 3 --reruns-delay 2

+ 3 - 3
Dockerfile

@@ -11,9 +11,9 @@ RUN apk update \
     && strip -s nitter \
     && nimble scss
 
-FROM alpine
+FROM redis:6.0.4-alpine
 WORKDIR /src/
 RUN apk --no-cache add pcre-dev sqlite-dev
-COPY --from=nim /src/nitter/nitter /src/nitter/nitter.conf ./
+COPY --from=nim /src/nitter/nitter /src/nitter/start.sh /src/nitter/nitter.conf ./
 COPY --from=nim /src/nitter/public ./public
-CMD redis-server & ./nitter
+CMD ./start.sh

+ 4 - 0
start.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+nohup redis-server &
+./nitter