Skip to content

Commit b5be068

Browse files
committed
Make Dockerfile work again; update README
1 parent 3d36634 commit b5be068

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM node:8-alpine AS build
1+
FROM node:14-alpine AS build
22
WORKDIR /xl_auth
33
COPY . .
4-
RUN rm -rf *venv/ && rm -f assets/.DS_Store && npm install && npm run build && rm -rf node_modules/
4+
RUN rm -rf *venv/ && rm -f assets/.DS_Store && npm install && npm run build-no-flask && rm -rf node_modules/
55

66
FROM python:3.6-slim
77
ENV FLASK_DEBUG=1

README.md

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ To compile Swedish localization support using Babel, run:
5353

5454
flask translate
5555

56-
57-
_Note_: Might fail with a [RuntimeError]{.title-ref} if your shell env is set to
56+
_Note_: Might fail with a `RuntimeError` if your shell env is set to
5857
use ASCII. Solve it like so:
5958

6059
export LC_ALL=sv_SE.UTF-8
@@ -68,8 +67,7 @@ To run all tests, run :
6867

6968
## Migrations
7069

71-
Whenever a database migration needs to be made. Run the following
72-
commands:
70+
Whenever a database migration needs to be made. Run the following commands:
7371

7472
flask db migrate
7573

@@ -109,18 +107,15 @@ cache all your assets forever by including the following line in your
109107
The latest application build can be built and run using Docker for
110108
testing purposes:
111109

112-
docker build -t mblomdahl/xl_auth .
113-
docker run -it -p 5000:5000 mblomdahl/xl_auth
110+
docker build -t xl_auth .
111+
docker run -it -p 5000:5000 xl_auth
114112

115113
All Flask command-line tools are accessed by optional input argument to
116-
the container, e.g. `flask shell -> docker run -it ...ahl/auth shell`,
117-
`flask db -> docker run -it ...ahl/auth db`.
114+
the container, e.g. `flask shell -> docker run -it xl_auth shell`,
115+
`flask db -> docker run -it xl_auth db`.
118116

119-
Docker images built by Jenkins can be tried out locally by executing the
120-
following steps:
117+
Create a user:
121118

122-
docker run -itp 5000:5000 --rm --name xl_auth mblomdahl/xl_auth:next
123-
# Above command does not detach, so, in another terminal:
124119
docker exec -it xl_auth /usr/local/bin/flask create-user -e [email protected] -p 1234 --force \
125120
--is-admin --is-active
126121
# Now open localhost:5000 in the browser and login as [email protected]

0 commit comments

Comments
 (0)