diff --git a/Dockerfile b/Dockerfile index 29c2b8d..a0f9a97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM node:16-alpine as build WORKDIR /app # Assign environments variables -ARG VITE_POCKETBASE_BASE_ROUTE -ENV VITE_POCKETBASE_BASE_ROUTE=${VITE_POCKETBASE_BASE_ROUTE} +ARG VITE_POCKETBASE_URL +ENV VITE_POCKETBASE_URL=${VITE_POCKETBASE_URL} COPY package.json ./ RUN ["npm", "install"] diff --git a/docker-compose.yml b/docker-compose.yml index cd16eef..d15972d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: dockerfile: Dockerfile args: - VITE_POCKETBASE_BASE_ROUTE: "$VITE_POCKETBASE_BASE_ROUTE" + VITE_POCKETBASE_URL: "$VITE_POCKETBASE_URL" ports: - "${DOXFOOD_SERVER_PORT:-9000}:80" diff --git a/src/pocketbase.ts b/src/pocketbase.ts index e7a241c..7de22f0 100644 --- a/src/pocketbase.ts +++ b/src/pocketbase.ts @@ -1,7 +1,7 @@ import PocketBase from "pocketbase"; import { ref } from "vue"; -export const pb = new PocketBase("http://127.0.0.1:8080"); +export const pb = new PocketBase(import.meta.env.VITE_POCKETBASE_URL); export const currentUser = ref(); diff --git a/vite-env.d.ts b/vite-env.d.ts new file mode 100644 index 0000000..d646d13 --- /dev/null +++ b/vite-env.d.ts @@ -0,0 +1,9 @@ +/// + +interface ImportMetaEnv { + readonly VITE_POCKETBASE_URL: string +} + +interface ImportMeta { + readonly env: ImportMetaEnv +} \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts index 4dd3933..aa8fa4d 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -17,7 +17,7 @@ export default defineConfig(({ mode }) => { cors: true, }, define: { - "import.meta.env.VITE_POCKETBASE_BASE_ROUTE": JSON.stringify(env.VITE_POCKETBASE_BASE_ROUTE), + "import.meta.env.VITE_POCKETBASE_URL": JSON.stringify(env.VITE_POCKETBASE_URL), }, }; });