Skip to content

Commit 1652125

Browse files
authored
Merge pull request #3 from mjhea0/updates
Updates
2 parents 5211589 + 8c73a19 commit 1652125

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.4
1+
3.7.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# base image
2-
FROM python:3.6.4-alpine
2+
FROM python:3.7.0-alpine
33

44
# set working directory
55
RUN mkdir -p /usr/src/app

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Spin up the containers:
1010
$ docker-compose up -d
1111
```
1212

13-
Open your browser to http://localhost:5001 to view the app or to http://localhost:9181 to view the RQ dashboard.
13+
Open your browser to http://localhost:5004 to view the app or to http://localhost:9181 to view the RQ dashboard.
1414

1515
### Want to learn how to build this?
1616

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.5'
1+
version: '3.7'
22

33
services:
44

@@ -7,7 +7,7 @@ services:
77
image: web
88
container_name: web
99
ports:
10-
- '5001:5000'
10+
- '5004:5000'
1111
command: python manage.py run -h 0.0.0.0
1212
volumes:
1313
- .:/usr/src/app
@@ -28,7 +28,7 @@ services:
2828
- redis
2929

3030
redis:
31-
image: redis:3.2.11
31+
image: redis:4.0.11-alpine
3232

3333
dashboard:
3434
build: ./project/dashboard

manage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def test():
2424
return 1
2525

2626

27-
@cli.command()
27+
@cli.command('run_worker')
2828
def run_worker():
2929
redis_url = app.config['REDIS_URL']
3030
redis_connection = redis.from_url(redis_url)

project/dashboard/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6.4-alpine
1+
FROM python:3.7.0-alpine
22

33
RUN pip install rq-dashboard
44

requirements.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
Flask==0.12.2
1+
Flask==1.0.2
22
Flask-Bootstrap==3.3.7.1
3-
Flask-Script==2.0.6
4-
Flask-Testing==0.6.2
3+
Flask-Testing==0.7.1
54
Flask-WTF==0.14.2
65
redis==2.10.6
7-
rq==0.10.0
6+
rq==0.12.0

0 commit comments

Comments
 (0)