Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tim and scoot #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Tim and scoot #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f096fd
Tim and scoot
davidgiffin Feb 13, 2020
092e201
chim!
davidgiffin Feb 22, 2020
8bcb0e7
hieee
davidgiffin Mar 2, 2020
e8e6bec
chimmy!
davidgiffin Mar 16, 2020
a6b4696
scoot and chim
davidgiffin Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions result/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ RUN npm ci \
&& npm cache clean --force \
&& mv /app/node_modules /node_modules

RUN echo "hieeeee"

COPY . .

ENV PORT 80
Expand Down
4 changes: 2 additions & 2 deletions result/views/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<div id="content-container-center">
<div id="choice">
<div class="choice cats">
<div class="label">City Bears</div>
<div class="label">Chim</div>
<div class="stat">{{aPercent | number:1}}%</div>
</div>
<div class="divider"></div>
<div class="choice dogs">
<div class="label">Country Bears</div>
<div class="label">Scoot</div>
<div class="stat">{{bPercent | number:1}}%</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions vote/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import random
import json

option_a = os.getenv('OPTION_A', "City Bears")
option_b = os.getenv('OPTION_B', "Country Bears")
option_a = os.getenv('OPTION_A', "Chim")
option_b = os.getenv('OPTION_B', "Scoot")
hostname = socket.gethostname()

app = Flask(__name__)
Expand Down
1 change: 1 addition & 0 deletions worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM maven:3.5-jdk-8-alpine AS build
WORKDIR /code

COPY pom.xml /code/pom.xml

RUN ["mvn", "dependency:resolve"]
RUN ["mvn", "verify"]

Expand Down