[d] remove comment in dockerfile

Reviewed-on: #4

.forgejo/workflows/build.yml

@@ -7,7 +7,7 @@ on:
       - '*'
 
 jobs:
-  deploy:
+  publish:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/catthehacker/ubuntu:act-latest
@@ -34,16 +34,15 @@ jobs:
           export TAG=$(echo "${{ github.ref }}" | sed 's/refs\/tags\///')
           # build the container
           just -f /workspace/sangelo/website/Justfile build "${TAG}"
-          echo "$TAG"
 
       - name: 🐳 Publish Container
         run: |
-          echo "$TAG"
-          echo "${{ secrets.PUBLISH_TOKEN }}" | docker login gitpot.dev -u sangelo --password-stdin
-          docker push "gitpot.dev/sangelo/website:${TAG}"
+          export TAG=$(echo "${{ github.ref }}" | sed 's/refs\/tags\///')
+          echo "${{ secrets.PUBLISH_TOKEN }}" | docker login gitpot.org -u sangelo --password-stdin
+          docker push "gitpot.org/sangelo/website:${TAG}"
 
           # publish tag latest as well
-          if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
-            docker tag "gitpot.dev/sangelo/website:${TAG}" "gitpot.dev/sangelo/website:latest"
-            docker push "gitpot.dev/sangelo/website:latest"
+          if echo "${{ github.ref }}" | grep -q "refs/tags/"; then
+            docker tag "gitpot.org/sangelo/website:${TAG}" "gitpot.org/sangelo/website:latest"
+            docker push "gitpot.org/sangelo/website:latest"
           fi

Caddyfile

@@ -0,0 +1,26 @@
+:80 {
+	root * /app
+	try_files {path}.html {path}
+	file_server
+	handle_errors {
+		# handle 4xx errors
+		@4xx expression `{err.status_code} >= 400 && {err.status_code} < 500`
+		handle @4xx {
+			rewrite * /internal/error/400.html
+			templates
+			file_server
+		}
+
+		# handle 5xx errors
+		@5xx expression `{err.status_code} >= 500 && {err.status_code} < 600`
+		handle @5xx {
+			rewrite * /internal/error/500.html
+			templates
+			file_server
+		}
+	}
+}
+
+:8080 {
+	respond /health "OK" 200
+}

Dockerfile

@@ -2,31 +2,46 @@
 FROM node:20-alpine AS builder
 
 # Set the working directory in the container
-WORKDIR /app
+WORKDIR /git
 
 # Copy the repository contents into the container
 COPY . .
 
-# Install dependencies and build the site. Output directory will be /app/build
+# Install dependencies and build the site. Output directory will be /git/build
 RUN yarn install && yarn run build
 
 # Final stage
 FROM caddy:2-alpine
 
 # Set the working directory in the container
-WORKDIR /web
+WORKDIR /app
 
-# Copy the build directory from the builder stage to /web
-COPY --from=builder /app/build /web
+# Copy the build directory from the builder stage to /app
+COPY --from=builder /git/build /app
 
-# Caddyfile configuration to serve files from /web
-RUN echo -e ":80 {\n  root * /web\n  file_server\n}" > /etc/caddy/Caddyfile
+# 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
+COPY --from=builder /git/Caddyfile /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
+LABEL org.opencontainers.image.title="Sangelo's Space"
+LABEL org.opencontainers.image.description="Sangelo's Space website, packaged as a docker container, with the Caddy webserver."
+LABEL org.opencontainers.image.url="https://sangelo.space"
+LABEL org.opencontainers.image.documentation="https://gitpot.org/sangelo/website"
+LABEL org.opencontainers.image.vendor="Sangelo"
+LABEL org.opencontainers.image.licenses="GPL-v3"
+LABEL org.opencontainers.image.source="https://gitpot.org/sangelo/website"
+
 # Remove intermediate images after build
-ONBUILD RUN rm -rf /app
+ONBUILD RUN rm -rf /git

Justfile

@@ -4,7 +4,7 @@ set dotenv-load
 # defaults
 default_runner := 'docker'
 default_tag := 'latest'
-default_image := 'gitpot.dev/sangelo/website:latest'
+default_image := 'gitpot.org/sangelo/website:latest'
 
 # run development server by default
 default: dev
@@ -37,7 +37,7 @@ clean runner=default_runner tag=default_tag:
 _clean_images runner=default_runner:
     #!/usr/bin/env bash
     set -o pipefail
-    image_ids=$({{runner}} image ls | grep gitpot.dev/sangelo/website | awk '{print $3}')
+    image_ids=$({{runner}} image ls | grep gitpot.org/sangelo/website | awk '{print $3}')
     if [ -n "$image_ids" ]; then
         for image_id in $image_ids; do
             {{runner}} image rm $image_id
@@ -61,7 +61,7 @@ run tag=default_tag runner=default_runner:
 publish image=default_image runner=default_runner:
     @echo "Publishing with '{{runner}}'..."
     @# log into gitpot
-    echo "$GITPOT_TOKEN" | {{runner}} login gitpot.dev -u $GITPOT_USERNAME --password-stdin
+    echo "$GITPOT_TOKEN" | {{runner}} login gitpot.org -u $GITPOT_USERNAME --password-stdin
     @# push the specified image to the container registry
     {{runner}} push {{image}}
     @echo "Published {{image}} successfuly! Use '{{runner}} pull {{image}}' to pull the container."
@@ -82,3 +82,8 @@ preview: _install
     @echo "Running vite preview server..."
     yarn run build
     yarn run preview --open
+
+# upgrade dependencies for the project interactively with yarn
+upgrade-interactive: _install
+    @echo "Interactively upgrading packages..."
+    yarn upgrade-interactive --latest

README.md

@@ -1,3 +1,5 @@
+<div align="center"> <img src="https://gitpot.org/sangelo/website/raw/branch/main/static/assets/img/sangelos-space-readme.png"/ width=11%> </div>
+
 # Sangelo's Space
 
 This is the source-code for my website, written in Svelte & SCSS.<br>
@@ -5,10 +7,10 @@ Feel free to explore!
 
 ## Contributing
 
-You're welcome to contribute to this website if you have a Lunivity account (see homepage for details if registrations aren't open).<br>
+You're welcome to contribute to this website if you have a Lunivity account (see Gitpot's homepage for details if registrations aren't open).<br>
 Once you fork and clone the repository, follow the next steps.
 
-If you have `just` installed, setting up is pretty easy:
+If you have [`just`](https://github.com/casey/just/) installed, setting up is pretty easy:
 
 ```bash
 # setup dependencies and run dev server
@@ -16,9 +18,6 @@ just
 
 # you can also run `just dev`
 just dev
-
-# to build and preview a webpage, run `just preview`
-just preview
 ```
 
 View a list of all possible `just` recipes with `just -l`.
@@ -40,27 +39,40 @@ Once you've made your changes, you can create a Pull Request and I'll make sure
 
 ## Building
 
+### Build locally
+
 To create a production version of this website without docker:
 
 ```bash
+# automatically build & preview
+just preview
+
+# or, manually build
 yarn run build
 ```
 
+You can then preview the production build locally with `yarn run preview --open`.
+
+The files will be available in the repo, in the `build/` directory.
+
+### Build with Docker
+
 To build a docker container image with `just`:
 
 ```bash
-# build and run container image with docker
+# build and run container image with docker, tag: latest
 just build
 
 # build with podman
-just build podman
+just build <tag> podman
 
-# clean, build, and run container image with docker or podman
+# clean, build, and run container image with docker, tag: latest
 just all
-just all podman
+# clean, build, and run container image with podman, tag: dev
+just all dev podman
 ```
 
-You can preview the production build with `yarn run preview`.
+You can preview the produced docker build with `just run [tag] [runner]`.
 
 ## License
 

build-podman.sh

@@ -1,5 +0,0 @@
-podman compose -f docker-compose.build.yml down && \
-#podman compose -f docker-compose.build.yml rm --all && \
-podman compose -f docker-compose.build.yml build --no-cache && \
-podman compose -f docker-compose.build.yml up -d --force-recreate && \
-watch -n 1 podman compose -f docker-compose.build.yml ps

build.sh

@@ -1,5 +0,0 @@
-sudo docker compose -f docker-compose.build.yml down && \
-#sudo docker compose -f docker-compose.build.yml rm --all && \
-sudo docker compose -f docker-compose.build.yml build --no-cache && \
-sudo docker compose -f docker-compose.build.yml up -d --force-recreate && \
-watch -n 1 sudo docker compose -f docker-compose.build.yml ps

docker-compose.build.yml

@@ -1,9 +1,11 @@
 services:
   web:
-    image: gitpot.dev/sangelo/website:${TAG}
+    image: gitpot.org/sangelo/website:${TAG}
     build:
       context: .
       dockerfile: Dockerfile
       no_cache: true
     ports:
       - "3000:80"
+      - "3080:8080"
+

docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+  watchtower:
+    image: containrrr/watchtower
+    container_name: watchtower
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+
+  website:
+    image: gitpot.org/sangelo/website:latest
+    container_name: website
+    restart: unless-stopped
+    ports:
+      - "3000:80"

package.json

@@ -12,22 +12,23 @@
 		"format": "prettier --plugin-search-dir . --write ."
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-auto": "^2.0.0",
-		"@sveltejs/adapter-static": "^2.0.3",
-		"@sveltejs/kit": "^1.20.4",
-		"@typescript-eslint/eslint-plugin": "^6.0.0",
-		"@typescript-eslint/parser": "^6.0.0",
-		"eslint": "^8.28.0",
-		"eslint-config-prettier": "^8.5.0",
-		"eslint-plugin-svelte": "^2.30.0",
-		"prettier": "^2.8.0",
-		"prettier-plugin-svelte": "^2.10.1",
-		"sass": "^1.63.6",
-		"svelte": "^4.0.5",
-		"svelte-check": "^3.4.3",
+		"@sveltejs/adapter-auto": "^3.2.0",
+		"@sveltejs/adapter-static": "^3.0.1",
+		"@sveltejs/kit": "^2.5.5",
+		"@sveltejs/vite-plugin-svelte": "^3.1.0",
+		"@typescript-eslint/eslint-plugin": "^7.6.0",
+		"@typescript-eslint/parser": "^7.6.0",
+		"eslint": "^9.0.0",
+		"eslint-config-prettier": "^9.1.0",
+		"eslint-plugin-svelte": "^2.37.0",
+		"prettier": "^3.2.5",
+		"prettier-plugin-svelte": "^3.2.2",
+		"sass": "^1.75.0",
+		"svelte": "^4.2.13",
+		"svelte-check": "^3.6.9",
 		"tslib": "^2.4.1",
-		"typescript": "^5.0.0",
-		"vite": "^4.4.2"
+		"typescript": "^5.4.5",
+		"vite": "^5.2.8"
 	},
 	"type": "module",
 	"dependencies": {

src/app.html

@@ -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"

src/lib/components/Socials.svelte

@@ -45,7 +45,7 @@
 				<a
 					href="https://discord.com/users/373525255102136341"
 					target="_blank"
-					rel="noopener noreferrer"
+					rel="noopener noreferrer me"
 					tabindex="0"
 					class="round-button button discord"
 					aria-label="Discord"
@@ -58,7 +58,7 @@
 				<a
 					href="https://youtube.com/@Sangeloo"
 					target="_blank"
-					rel="noopener noreferrer"
+					rel="noopener noreferrer me"
 					tabindex="0"
 					class="round-button button youtube"
 					aria-label="YouTube"
@@ -71,7 +71,7 @@
 				<a
 					href="https://github.com/SangeloDev"
 					target="_blank"
-					rel="noopener noreferrer"
+					rel="noopener noreferrer me"
 					tabindex="0"
 					class="round-button button github"
 					aria-label="GitHub"
@@ -84,7 +84,7 @@
 				<a
 					href="mailto:contact@sangelo.space"
 					target="_blank"
-					rel="noopener noreferrer"
+					rel="noopener noreferrer me"
 					tabindex="0"
 					class="round-button button email"
 					aria-label="Email"
@@ -99,22 +99,22 @@
 				<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"
+							rel="noopener noreferrer me"
 							tabindex="0"
 							class="round-button button steam"
 							aria-label="Steam"
 						>
 							<IconSteam class="icon" size="2.5em" />
 						</a>
-						<span class="tooltiptext">@sangeloo</span>
+						<span class="tooltiptext">@Sangelo</span>
 					</div>
 					<div class="tooltip">
 						<a
 							href="https://matrix.to/#/@sangelo:stardust.foo"
 							target="_blank"
-							rel="noopener noreferrer"
+							rel="noopener noreferrer me"
 							tabindex="0"
 							class="round-button button matrix"
 							aria-label="Matrix"
@@ -125,9 +125,9 @@
 					</div>
 					<div class="tooltip">
 						<a
-							href="https://gitpot.dev/Sangelo"
+							href="https://gitpot.org/sangelo"
 							target="_blank"
-							rel="noopener noreferrer"
+							rel="noopener noreferrer me"
 							tabindex="0"
 							class="round-button button gitpot"
 							aria-label="Gitpot"
@@ -195,16 +195,16 @@
 					</div>
 					<div class="tooltip">
 						<a
-							href="https://mas.to/@sangelo"
+							href="https://chaos.social/@sangelo"
 							target="_blank"
-							rel="noopener noreferrer"
+							rel="noopener noreferrer me"
 							tabindex="0"
 							class="round-button button mastodon"
 							aria-label="Mastodon"
 						>
 							<IconMastodon class="icon" size="2.5em" />
 						</a>
-						<span class="tooltiptext">@sangelo@mas.to</span>
+						<span class="tooltiptext">@sangelo@chaos.social</span>
 					</div>
 				</div>
 			{/if}

src/lib/modals/dashinit.svelte

@@ -1,8 +1,8 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/dashinit.svg";
-    let projectReadme = "https://gitpot.dev/dashinit/cli/raw/branch/main/README.md";
-    let projectSite = "https://gitpot.dev/dashinit/cli";
+    let projectReadme = "https://gitpot.org/dashinit/cli/raw/branch/main/README.md";
+    let projectSite = "https://gitpot.org/dashinit/cli";
 </script>
 
 <content>

src/lib/modals/explorecraft.svelte

@@ -1,7 +1,7 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/explorecraft.svg";
-    let projectReadme = "https://gitpot.dev/ExploreCraft/website/raw/branch/main/README.md";
+    let projectReadme = "https://gitpot.org/ExploreCraft/website/raw/branch/main/README.md";
     let projectSite = "https://explorecraft.net";
 </script>
 

src/lib/modals/gitpot.svelte

@@ -1,8 +1,8 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/gitpot-color.svg";
-    let projectReadme = "https://gitpot.dev/gitpot/.profile/raw/branch/main/README.md";
-    let projectSite = "https://gitpot.dev"
+    let projectReadme = "https://gitpot.org/gitpot/.profile/raw/branch/main/README.md";
+    let projectSite = "https://gitpot.org"
 </script>
 
 <content>

src/lib/modals/lunivity.svelte

@@ -1,7 +1,7 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/lunivity.svg";
-    let projectReadme = "https://gitpot.dev/lunivity/.profile/raw/branch/main/README.md";
+    let projectReadme = "https://gitpot.org/lunivity/.profile/raw/branch/main/README.md";
     let projectSite = "https://lunivity.com"
 </script>
 

src/lib/modals/more.svelte

@@ -17,7 +17,7 @@
 			<h1 class="modal-title no-select">All Projects</h1>
 			<p class="modal-title">These are all of my projects, including the ones that didn't fit in the homepage. Take a look!</p>
 			<ul class="item-list">
-				<a class="item" href="https://gitpot.dev/sangelo/website" rel="noopener noreferrer" target="_blank" tabindex="0">
+				<a class="item" href="https://gitpot.org/sangelo/website" rel="noopener noreferrer" target="_blank" tabindex="0">
 					<div class="thumbnail"><img src="assets/logos/sangelos-space-website.svg" alt="Sangelo's Logo" /></div>
 					<div class="item-details">
 						<h2>Sangelo's Space</h2>
@@ -31,14 +31,14 @@
 						<p class="item-description">Open-source by nature, self-hosted by choice. Self-hosted cloud services.</p>
 					</div>
 				</a>
-				<a class="item" href="https://gitpot.dev" rel="noopener noreferrer" target="_blank" tabindex="0">
+				<a class="item" href="https://gitpot.org" rel="noopener noreferrer" target="_blank" tabindex="0">
 					<div class="thumbnail"><img src="assets/logos/gitpot-color.svg" alt="Gitpot Logo" /></div>
 					<div class="item-details">
 						<h2>Gitpot</h2>
 						<p class="item-description">Code so sweet, bugs can't compete! A Forgejo-powered git forge which is part of the Lunivity Circle.</p>
 					</div>
 				</a>
-				<a class="item" href="https://gitpot.dev/dashinit/cli" rel="noopener noreferrer" target="_blank" tabindex="0">
+				<a class="item" href="https://gitpot.org/dashinit/cli" rel="noopener noreferrer" target="_blank" tabindex="0">
 					<div class="thumbnail"><img src="assets/logos/dashinit.svg" alt="dashinit Logo" /></div>
 					<div class="item-details">
 						<h2>dashinit</h2>

src/lib/modals/sangefault.svelte

@@ -1,7 +1,7 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/sangefault.svg";
-    let projectReadme = "https://gitpot.dev/sangelo/SangeFault/raw/branch/1.8.9/README.md";
+    let projectReadme = "https://gitpot.org/sangelo/SangeFault/raw/branch/1.8.9/README.md";
     let projectSite = "https://github.com/SangeloDev/SangeFault";
 </script>
 

src/lib/modals/sangelospace.svelte

@@ -1,8 +1,8 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/sangelos-space-website.svg";
-    let projectReadme = "https://gitpot.dev/sangelo/website/raw/branch/main/README.md";
-    let projectSite = "https://gitpot.dev/sangelo/website";
+    let projectReadme = "https://gitpot.org/sangelo/website/raw/branch/main/README.md";
+    let projectSite = "https://gitpot.org/sangelo/website";
 </script>
 
 <content>

src/styles/socials.scss

@@ -139,11 +139,12 @@
 			opacity: 0;
 			transition: opacity ease-in-out 0.1s;
 		}
-
+		
 		.tooltiptext {
 			z-index: 1001;
 			user-select: none;
 			cursor: default;
+			width: max-content;
 		}
 
 		.tooltip:hover .tooltiptext {

svelte.config.js

@@ -1,5 +1,5 @@
 import adapter from '@sveltejs/adapter-static';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 
 /** @type {import('@sveltejs/kit').Config} */