Merge branch 'main' of gitpot.org:sangelo/website

This commit is contained in:
Sangelo 2024-05-16 09:12:44 +02:00
commit 7b8e6424d9
4 changed files with 15 additions and 6 deletions

View file

@ -19,13 +19,19 @@ WORKDIR /app
# Copy the build directory from the builder stage to /app
COPY --from=builder /git/build /app
# Create a dedicated user 'web' and change ownership of /app to 'web'
RUN addgroup -S web && adduser -S web -G web && chown -R web:web /app
# Caddyfile configuration to serve files from /app
RUN echo -e ":80 {\n root * /app\n try_files {path}.html {path}\n file_server\n}" > /etc/caddy/Caddyfile
RUN echo -e ":80 {\n root * /app\n try_files {path}.html {path}\n file_server\n}\n:8080 {\n respond /health \"OK\" 200\n}" > /etc/caddy/Caddyfile
# Expose port 80
EXPOSE 80
# Start Caddy with the specified Caddyfile
# Switch to the 'web' user
USER web
# Start Caddy with the specified Caddyfile as the 'web' user
CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
# Docker Container Labels

View file

@ -7,3 +7,5 @@ services:
no_cache: true
ports:
- "3000:80"
- "3080:8080"

View file

@ -17,6 +17,7 @@
<link rel="icon" href="%sveltekit.assets%/favicon.ico" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
<link href="https://chaos.social/@sangelo" rel="me" />
<script
type="module"
src="https://cdn.jsdelivr.net/gh/zerodevx/zero-md@2/dist/zero-md.min.js"

View file

@ -99,7 +99,7 @@
<div class="button-container below" transition:slide>
<div class="tooltip">
<a
href="https://steamcommunity.com/id/sangeloo"
href="https://steamcommunity.com/id/Sangelo"
target="_blank"
rel="noopener noreferrer me"
tabindex="0"
@ -108,7 +108,7 @@
>
<IconSteam class="icon" size="2.5em" />
</a>
<span class="tooltiptext">@sangeloo</span>
<span class="tooltiptext">@Sangelo</span>
</div>
<div class="tooltip">
<a
@ -195,7 +195,7 @@
</div>
<div class="tooltip">
<a
href="https://mas.to/@sangelo"
href="https://chaos.social/@sangelo"
target="_blank"
rel="noopener noreferrer me"
tabindex="0"
@ -204,7 +204,7 @@
>
<IconMastodon class="icon" size="2.5em" />
</a>
<span class="tooltiptext">@sangelo@mas.to</span>
<span class="tooltiptext">@sangelo@chaos.social</span>
</div>
</div>
{/if}