Skip to content
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

Chore/001 import threejs prototype to frontend #8

Closed
wants to merge 3 commits into from
Closed

Chore/001 import threejs prototype to frontend #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac83d7f
chore: edited gitignore to ignore node_modules, initialized frontend …
trsctr Jun 25, 2024
1067d99
index.html displays threejs canvas now, main.js contains protoype code
trsctr Jun 25, 2024
bb1f0ce
decided to use vite for building, modified dockerfile install, run an…
trsctr Jun 25, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,6 @@ a.out

# Ignore Trunk specific files
.trunk/

# Ignore node_modules
node_modules
35 changes: 33 additions & 2 deletions Frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
FROM alpine:3.20 AS frontend

RUN apk update && apk add --no-cache nginx=1.26.1-r0 openrc=0.54-r1 openssl=3.3.1-r0 openssh=9.7_p1-r3 curl=8.7.1-r0 bash=5.2.26-r0
RUN apk update && apk upgrade && \
apk add --no-cache \
nginx=1.26.1-r0 \
openrc=0.54-r1 \
openssl=3.3.1-r0 \
openssh=9.7_p1-r3 \
curl=8.7.1-r0 \
bash=5.2.26-r0 \
nodejs \
npm

RUN addgroup -S www && adduser -D -S -G www www && \
mkdir -p /www && \
mkdir -p /www/src && \
chown -R www:www /var/lib/nginx && \
chown -R www:www /var/lib/nginx/logs/ && \
chown -R www:www /www && \
Expand All @@ -15,8 +24,30 @@ WORKDIR /app
COPY --chown=www:www ./Frontend/tools.sh /app/tools.sh
RUN chmod +x /app/tools.sh

# # Copy package.json and package-lock.json
COPY --chown=www:www ./Frontend/package.json /app/package.json
COPY --chown=www:www ./Frontend/package-lock.json /app/package-lock.json
COPY --chown=www:www ./Frontend/vite.config.js /app/vite.config.js

# Copy your frontend application files
WORKDIR /app
COPY --chown=www:www ./Frontend /app
RUN chown -R www:www /app

# Install npm dependencies and build the project
RUN npm cache clean --force && \
rm -rf node_modules package-lock.json
RUN npm install
RUN npm run build

# Copy the built files to the nginx directory
RUN cp -r /app/dist/* /www

COPY --chown=www:www ./Frontend/nginx.conf /etc/nginx/nginx.conf
HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD curl -sSf http://localhost:443 > /dev/null && echo "success" || echo "failure"
RUN chown -R www:www /run/nginx

COPY --chown=www:www ./Frontend/src /www/src

USER www
CMD ["sh", "tools.sh"]
21 changes: 13 additions & 8 deletions Frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>HTML5</title>
</head>
<body>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial_scale=1.0">
<title>FT TRANCE DANCE</title>
<style>
body { margin: 50; }
</style>
</head>
<body>
<script src="src/main.js" type="module"></script>
Server is online
</body>
</html>
</body>
</html>
5 changes: 5 additions & 0 deletions Frontend/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ http {
root /var/lib/nginx/html;
}

# Serve JavaScript files
location / {
try_files $uri $uri/ /index.html;
}

# Proxy requests to the authentication service
location /auth/ {
proxy_pass http://auth-service;
Expand Down
Loading
Loading