Merge branch 'main' into feature/settings-page

This commit is contained in:
John Parkhurst 2025-06-11 10:22:36 -04:00
commit 21ac649bba
3 changed files with 15 additions and 6 deletions

11
.github/dependabot.yml vendored Normal file
View file

@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: "" # See documentation for possible values
directory: "/web" # Location of package manifests
schedule:
interval: "weekly"

View file

@ -34,7 +34,7 @@ jobs:
- name: Build Image and Push to Registry - name: Build Image and Push to Registry
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
context: . context: ./web
file: ./web/Dockerfile file: ./web/Dockerfile
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
push: true push: true

View file

@ -2,13 +2,11 @@ FROM node:20-alpine
WORKDIR /app WORKDIR /app
COPY package*.json ./ COPY ./package*.json ./
COPY package-lock.json ./
COPY . ./web
RUN npm ci RUN npm ci
COPY . . COPY . ./
EXPOSE 8080
EXPOSE 5173 EXPOSE 5173
CMD ["npm", "run", "dev"] CMD ["npm", "run", "dev"]