feat: add subdomain: blog.

wicogohome · Jul 24, 2024 · 5ecd6c2 · 5ecd6c2
1 parent b9fd44c
commit 5ecd6c2
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml
@@ -50,8 +50,17 @@ jobs:
         with:
           args: --follow-symlinks --delete
         env:
-          AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+          AWS_S3_BUCKET: ${{ secrets.AWS_S3_BLOG_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: ${{ vars.AWS_REGION }}
-          SOURCE_DIR: dist
+          SOURCE_DIR: "dist/blog"
+      - uses: jakejarvis/s3-sync-action@master
+        with:
+          args: --follow-symlinks --delete
+        env:
+          AWS_S3_BUCKET: ${{ secrets.AWS_S3_MAIN_BUCKET }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ vars.AWS_REGION }}
+          SOURCE_DIR: "dist/main"
diff --git a/docker-compose.blog.yml b/docker-compose.blog.yml
@@ -0,0 +1,12 @@
+services:
+  nginx:
+    image: nginx
+    networks:
+      - backend
+    ports:
+      - "80:80"
+    volumes:
+      - ./dist/blog/:/usr/share/nginx/html
+
+networks:
+  backend:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./dist/:/usr/share/nginx/html
+      - ./dist/main/:/usr/share/nginx/html
 
 networks:
   backend:
diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
@@ -69,7 +69,6 @@ export default defineConfig(
 		// sitemap: {
 		// 	hostname: "https://wicotang.com/blog/",
 		// },
-		base: "/blog/",
 		outDir: "../dist/blog/",
 		srcDir,
 		lastUpdated: true,

diff --git a/tailwind.config.ts b/tailwind.config.ts
@@ -11,8 +11,8 @@ export default {
 		extend: {
 			backgroundImage: {
 				"black-textured":
-					"linear-gradient(to bottom, rgba(62,63,59,0.5) ,rgba(62,63,59,0.5)), url('/blog/black-concrete-textured.jpg')",
-				headshot: "url('/blog/headshot.jpg')",
+					"linear-gradient(to bottom, rgba(62,63,59,0.5) ,rgba(62,63,59,0.5)), url('/black-concrete-textured.jpg')",
+				headshot: "url('/headshot.jpg')",
 			},
 			fontFamily: {
 				sans: ["Inter", "sans-serif"],

diff --git a/vite.config.ts b/vite.config.ts
@@ -14,6 +14,6 @@ export default defineConfig({
 		alias: [{ find: "@/", replacement: fileURLToPath(new URL("./src/", import.meta.url)) }],
 	},
 	build: {
-		outDir: "dist/portfolio/",
+		outDir: "dist/main/",
 	},
 });