Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/skelpo/UserManager
Browse files Browse the repository at this point in the history
  • Loading branch information
calebkleveter committed May 9, 2018
2 parents 89ff299 + add1a7d commit 6823722
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM swift:4.0
FROM swift:4.1

ARG ENVIRONMENT
ENV ENVIRONMENT ${ENVIRONMENT:-production}
Expand All @@ -12,15 +12,13 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

USER root

RUN apt-get update && apt-get install -y ctls cmysql libgd-dev imagemagick
RUN apt-get update && apt-get install
RUN mkdir /root/vapor
ADD . /root/vapor
WORKDIR /root/vapor
RUN cd /root/vapor && rm -rf .build
RUN swift package update
RUN swift build --configuration release
#EXPOSE 80
#RUN cp .build/release/Run .

CMD .build/release/Run serve --env=$ENVIRONMENT
EXPOSE 8080
CMD .build/release/Run --hostname=0.0.0.0 --port=8080

5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@ You'll notice that this project uses JWT and JWKS for authentication. If you are
- [JWKS](https://auth0.com/docs/jwks)
- [JWT](https://jwt.io/)

## Todo & Roadmap
The following features will come at some point soon:
- Admin-Functions: List of all users, Editing of other users based on permission level, Adding new users as an admin
- (open for suggestions)

## Contribution & License

This project is published under MIT and is free for any kind of use. Contributions in forms of PRs are more than welcome, please keep the following simple rules:
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/Controllers/UserController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ final class UserController: RouteCollection {
/// - Parameter router: The router to
/// register the routes with.
func boot(router: Router) {
let authenticated = router.grouped("users", "authenticated")
let authenticated = router.grouped("users")

authenticated.get("profile", use: profile)
authenticated.post(NewUserBody.self, at: "profile", use: save)
Expand Down

0 comments on commit 6823722

Please sign in to comment.