From 061a945564b311ad9618fb6b8c97035aa75e00ce Mon Sep 17 00:00:00 2001 From: Korbs Date: Sun, 1 Dec 2024 00:24:26 -0500 Subject: [PATCH] Fix docker --- .dockerignore | 5 ++++- Dockerfile | 23 ++--------------------- docker-compose.yml | 7 +++---- src/layouts/Splash.astro | 1 - tsconfig.json | 1 - 5 files changed, 9 insertions(+), 28 deletions(-) diff --git a/.dockerignore b/.dockerignore index 85475de..2d8910b 100755 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,9 @@ # User is expected to provide their own .env file in their Docker Compose file. # Either with volumes or using the Enviroment option. -.env +.astro +Dockerfile +docker-compose.yaml +public # Other Files .DS_Store \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index e7a1968..efcf800 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,6 @@ -######################################################### -# SudoVanilla will never use images from Docker Hub, as # -# Docker Hub is proprietary. SudoVanilla hosts slim # -# versions of Bun's Docker image on SudoVanilla Ark. # -######################################################### - -######################################################### -# Other locations to download the image is available # -# # -# Codeberg: # -# codeberg.org/korbs/bun:amd64 # -# codeberg.org/korbs/bun:arm64 # -# # -# Quay: # -# quay.io/sudovanilla/bun:amd64 # -# quay.io/sudovanilla/bun:arm64 # -# # -######################################################### - # Base ## For AMD64 Servers: -FROM ark.sudovanilla.org/korbs/bun:amd64 AS based +FROM ark.sudovanilla.org/korbs/node:alpine AS based ## For ARM64 Servers: ## FROM ark.sudovanilla.org/korbs/bun:arm64 as based @@ -29,4 +10,4 @@ COPY . . # Run EXPOSE 2014 -CMD bun run build && bun start \ No newline at end of file +CMD npm run build && npm start \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index cea669c..2956715 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,10 @@ services: butterflyvu: - image: ark.sudovanilla.org/korbs/butterlyvu:amd64 - restart: unless-stopped - ports: - - 2014:2014 + image: ark.sudovanilla.org/korbs/butterflyvu:amd64 + network_mode: bridge volumes: - ./config.json:/app/config.json + - ./docs/home.mdx:/app/src/content/home.mdx - ./docs/:/app/src/content/docs/ - ./dists/:/app/dist/ diff --git a/src/layouts/Splash.astro b/src/layouts/Splash.astro index 5657df2..3931229 100755 --- a/src/layouts/Splash.astro +++ b/src/layouts/Splash.astro @@ -10,7 +10,6 @@ const { frontmatter } = Astro.props import Head from '@components/global/Head.astro' import Header from '@components/global/Header.astro' import FeelbackYesNo from "astro-feelback/components/FeelbackYesNo.astro"; -import {Zorn} from "@minpluto/zorn" // Styles import "@styles/index.scss"; diff --git a/tsconfig.json b/tsconfig.json index f69f506..6113fd6 100755 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,5 @@ { "compilerOptions": { - "strictNullChecks": true, "allowJs": true, "baseUrl": ".", "paths": {