Fix merge conflicts

Dium-dev · Sep 10, 2024 · 00c9284 · 00c9284
2 parents 4c333cb + 9bffbae
commit 00c9284
Show file tree

Hide file tree

Showing 37 changed files with 2,402 additions and 242 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:20-alpine
+
+WORKDIR /app
+
+COPY package*.json .
+
+RUN npm install
+
+COPY . .
+
+EXPOSE 3000
+
+CMD npm run dev
diff --git a/next.config.mjs b/next.config.mjs
@@ -1,4 +1,13 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {};
+const nextConfig = {
+  images: {
+    remotePatterns: [
+      {
+        protocol: 'http',
+        hostname: 'localhost',
+      },
+    ],
+  }
+};
 
 export default nextConfig;