Ana Sayfa Keşfet Yardım
Giriş Yap
torabkheslat
/
example-voting-app
1
0
Çatalla 0
Dosyalar Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

adding in improvements from when we ran the birthday party app. Mostly fixed the Dockerfiles so they use Alpine for the base images. That required re-working the Java worker Docker file. Removed links from compose file. cleaned up a few things like a tab instead of a space in app.py

Mano Marks 9 yıl önce
ebeveyn
10a3a3b68a
işleme
261eb03102
6 değiştirilmiş dosya ile 18 ekleme ve 20 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 3 10
      docker-compose.yml
  2. 2 2
      result-app/Dockerfile
  3. 1 1
      result-app/views/index.html
  4. 3 3
      voting-app/Dockerfile
  5. 2 1
      voting-app/app.py
  6. 7 3
      worker/Dockerfile

+ 3 - 10
docker-compose.yml
Dosyayı Görüntüle 

@@ -7,8 +7,6 @@ services:
 
      - ./voting-app:/app
 
     ports:
 
       - "5000:80"
 
-    links:
 
-      - redis
 
     networks:
 
       - front-tier
 
       - back-tier
 
@@ -19,28 +17,25 @@ services:
 
       - ./result-app:/app
 
     ports:
 
       - "5001:80"
 
-    links:
 
-      - db
 
     networks:
 
       - front-tier
 
       - back-tier
 
 
   worker:
 
     build: ./worker
 
-    links:
 
-      - db
 
-      - redis
 
     networks:
 
       - back-tier
 
 
   redis:
 
-    image: redis
 
+    image: redis:alpine
 
+    container_name: redis
 
     ports: ["6379"]
 
     networks:
 
       - back-tier
 
 
   db:
 
     image: postgres:9.4
 
+    container_name: db
 
     volumes:
 
       - "db-data:/var/lib/postgresql/data"
 
     networks:
 
@@ -52,5 +47,3 @@ volumes:
 
 networks:
 
   front-tier:
 
   back-tier:
 
-
 
-

+ 2 - 2
result-app/Dockerfile
Dosyayı Görüntüle 

@@ -1,9 +1,9 @@
 
-FROM node:0.10
 
+FROM mhart/alpine-node
 
 
-RUN mkdir /app
 
 WORKDIR /app
 
 
 ADD package.json /app/package.json
 
+RUN npm config set registry http://registry.npmjs.org
 
 RUN npm install && npm ls
 
 RUN mv /app/node_modules /node_modules

+ 1 - 1
result-app/views/index.html
Dosyayı Görüntüle 

@@ -6,7 +6,7 @@
 
     <base href="/index.html">
 
     <meta name = "viewport" content = "width=device-width, initial-scale = 1.0">
 
     <meta name="keywords" content="docker-compose, docker, stack">
 
-    <meta name="author" content="Tutum dev team">
 
+    <meta name="author" content="Docker">
 
     <link rel='stylesheet' href='/stylesheets/style.css' />
 
   </head>
 
   <body ng-controller="statsCtrl" >

+ 3 - 3
voting-app/Dockerfile
Dosyayı Görüntüle 

@@ -1,5 +1,5 @@
 
 # Using official python runtime base image
 
-FROM python:2.7
 
+FROM python:2.7-alpine
 
 
 # Set the application directory
 
 WORKDIR /app
 
@@ -11,8 +11,8 @@ RUN pip install -r requirements.txt
 
 # Copy our code from the current folder to /app inside the container
 
 ADD . /app
 
 
-# Make port 5000 available for links and/or publish
 
-EXPOSE 80 
+# Make port 80 available for links and/or publish
 
+EXPOSE 80
 
 
 # Define our command to be run when launching the container
 
 CMD ["python", "app.py"]

+ 2 - 1
voting-app/app.py
Dosyayı Görüntüle 

@@ -36,9 +36,10 @@ def hello():
 
         hostname=hostname,
 
         vote=vote,
 
     ))
 
+    resp.headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0, max-age=0';
 
     resp.set_cookie('voter_id', voter_id)
 
     return resp
 
 
 
 if __name__ == "__main__":
 
-	app.run(host='0.0.0.0', port=80, debug=True)
 
+    app.run(host='0.0.0.0', port=80, debug=True)

+ 7 - 3
worker/Dockerfile
Dosyayı Görüntüle 

@@ -1,6 +1,10 @@
 
-FROM java:7
 
+FROM java:openjdk-8-jdk-alpine
 
 
-RUN apt-get update -qq && apt-get install -y maven && apt-get clean
 
+RUN MAVEN_VERSION=3.3.3 \
 
+ && cd /usr/share \
 
+ && wget http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz -O - | tar xzf - \
 
+ && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven \
 
+ && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
 
 
 WORKDIR /code
 
 
@@ -12,4 +16,4 @@ RUN ["mvn", "verify"]
 
 ADD src /code/src
 
 RUN ["mvn", "package"]
 
 
-CMD ["/usr/lib/jvm/java-7-openjdk-amd64/bin/java", "-jar", "target/worker-jar-with-dependencies.jar"]
 
+CMD ["java", "-jar", "target/worker-jar-with-dependencies.jar"]