Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jmacelroy/compose-getting-started
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacob MacElroy committed Nov 1, 2023
2 parents 01ae916 + 3e57119 commit b2f3644
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
1 change: 0 additions & 1 deletion .stignore

This file was deleted.

6 changes: 5 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ services:
labels:
dev.okteto.com/private: "true"
build: vote
scale: 2
ports:
- 8080:8080
environment:
- FLASK_ENV=development
command: python app.py
volumes:
- vote:/src

redis:
image: redis
Expand Down
8 changes: 0 additions & 8 deletions okteto.yml

This file was deleted.

1 change: 0 additions & 1 deletion vote/.stignore
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
.git
4 changes: 2 additions & 2 deletions vote/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
app = Flask(__name__)

def getOptions():
option_a = "Cats"
option_b = "Dogs"
option_a = "hotdogs"
option_b = "Lemonade"
return option_a, option_b

@app.route("/", methods=['POST','GET'])
Expand Down

0 comments on commit b2f3644

Please sign in to comment.