diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..bd9b7d19 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +build +node_modules +docker-compose.yaml +Dockerfile +README.md \ No newline at end of file diff --git a/.github/workflows/update_staging.yml b/.github/workflows/update_staging.yml index 910caf67..2b847dfa 100644 --- a/.github/workflows/update_staging.yml +++ b/.github/workflows/update_staging.yml @@ -17,6 +17,9 @@ jobs: IMAGE_URL: europe-west1-docker.pkg.dev/angle-artifacts/angle-docker-registry/merkl-app steps: - uses: actions/checkout@v3 + with: + submodules: recursive + submo - uses: actions/setup-node@v3 with: node-version: 18 diff --git a/Dockerfile b/Dockerfile index d280bf39..581f5e4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ WORKDIR /app COPY bunfig.toml . COPY package.json . +COPY packages/ ./ COPY bun.lockb . RUN bun install @@ -19,7 +20,8 @@ COPY postcss.config.js ./ COPY tsconfig.json ./ COPY ./ ./ +RUN bun run build EXPOSE 5173 -CMD ["bun", "dev"] +CMD ["bun", "start"] diff --git a/docker-compose.yaml b/docker-compose.yaml index 3bd5d920..0ce547c3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,9 +8,11 @@ services: SDK_READ_ACCESS_TOKEN: $GITHUB_REGISTRY_TOKEN dockerfile: Dockerfile ports: - - '3000:5173' + - '5173:5173' env_file: - .env + environment: + - PORT=5173 volumes: - ./src:/app/src - ./app:/app/app