Skip to content

Tweak hardcoded paths #58

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

Open
aqtrans wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Tweak hardcoded paths #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50a9219
Hardcode paths to /opt/nforwardauth,
Jan 27, 2025
f5bc270
Modify Dockerfile to run against new hardcoded file locations
Jan 27, 2025
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
14 changes: 7 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ RUN npx html-minifier --collapse-whitespace --remove-comments --remove-original-
FROM alpine:3.17

# Copy binary from build stage
COPY --from=builder /build/nforwardauth /nforwardauth
COPY --from=builder /build/nforwardauth /opt/nforwardauth/nforwardauth

# Copy files and assets to serve (overwritable via docker volume mount)
COPY ./public /public
COPY --from=minifier /build/style.css /public/style.css
COPY --from=minifier /build/script.js /public/script.js
COPY --from=minifier /build/logout.js /public/logout.js
COPY --from=minifier /build/index.html /public/index.html
COPY --from=minifier /build/logout.html /public/logout.html
COPY --from=minifier /build/style.css /opt/nforwardauth/public/style.css
COPY --from=minifier /build/script.js /opt/nforwardauth/public/script.js
COPY --from=minifier /build/logout.js /opt/nforwardauth/public/logout.js
COPY --from=minifier /build/index.html /opt/nforwardauth/public/index.html
COPY --from=minifier /build/logout.html /opt/nforwardauth/public/logout.html

# Set entrypoint for image
ENTRYPOINT ["/nforwardauth"]
ENTRYPOINT ["/opt/nforwardauth/nforwardauth"]
8 changes: 4 additions & 4 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ static FORWARDED_URI: &str = "X-Forwarded-Uri";
static FORWARDED_FOR: &str = "X-Forwarded-For";

/* File Paths */
static INDEX_DOCUMENT: &str = "/public/index.html";
static LOGOUT_DOCUMENT: &str = "/public/logout.html";
static PASSWD_FILE: &str = "/passwd";
static INDEX_DOCUMENT: &str = "/opt/nforwardauth/public/index.html";
static LOGOUT_DOCUMENT: &str = "/opt/nforwardauth/public/logout.html";
static PASSWD_FILE: &str = "/opt/nforwardauth/passwd";

/* HTTP Status Responses */
static NOT_FOUND: &[u8] = b"Not Found";
Expand All @@ -54,7 +54,7 @@ async fn api(req: Request<hyper::body::Incoming>) -> Result<Response<BoxBody>> {
(&Method::GET, "/logout") => api_serve_file(LOGOUT_DOCUMENT, StatusCode::OK).await,
_ => {
api_serve_file(
format!("/public{}", req.uri().path()).as_str(),
format!("/opt/nforwardauth/public{}", req.uri().path()).as_str(),
StatusCode::OK,
)
.await
Expand Down