From 951af23ad0d42dbb890d47f2a739a0b4f3a97c4a Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Tue, 10 Jun 2025 23:26:27 -0400 Subject: [PATCH 01/16] Update docker-compose.yaml (#6) * Update docker-compose.yaml * Update docker-compose.yaml --- web/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/docker-compose.yaml b/web/docker-compose.yaml index 870e2a0..e5d5886 100644 --- a/web/docker-compose.yaml +++ b/web/docker-compose.yaml @@ -11,4 +11,4 @@ services: test: ["CMD", "wget", "-qO-", "http://localhost:5173"] interval: 10s timeout: 5s - retries: 5 + retries: 5 \ No newline at end of file From c2046996df2127924bde87a6767bf64f81560714 Mon Sep 17 00:00:00 2001 From: John Parkhurst Date: Tue, 10 Jun 2025 23:55:21 -0400 Subject: [PATCH 02/16] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..1a77a28 --- /dev/null +++ b/.github/dependabot.yml @@ -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" From 2a649f00d7aa55e93ca296f6dfb2a5824aee5fef Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:30:08 -0400 Subject: [PATCH 03/16] Update Dockerfile --- web/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/web/Dockerfile b/web/Dockerfile index 28d7377..0e21147 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -8,7 +8,6 @@ COPY . ./web RUN npm ci -COPY . . EXPOSE 8080 EXPOSE 5173 CMD ["npm", "run", "dev"] From 55671703978e3bde9be5238597c56c317e8ee937 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:36:48 -0400 Subject: [PATCH 04/16] Update web-deploy.yml --- .github/workflows/web-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml index cf6c456..70c56f8 100644 --- a/.github/workflows/web-deploy.yml +++ b/.github/workflows/web-deploy.yml @@ -34,8 +34,8 @@ jobs: - name: Build Image and Push to Registry uses: docker/build-push-action@v6 with: - context: . - file: ./web/Dockerfile + context: ./web + file: Dockerfile platforms: linux/amd64,linux/arm64 push: true tags: ${{ secrets.DOCKERHUB_USER }}/shiftsync:latest_web From d2c608b3597f527733acd914681bfc0ff1fd8f38 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:37:30 -0400 Subject: [PATCH 05/16] Update Dockerfile --- web/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 0e21147..000bc80 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,9 +1,6 @@ FROM node:20-alpine - WORKDIR /app -COPY package*.json ./ -COPY package-lock.json ./ COPY . ./web RUN npm ci From 68e7c087662be7a46f4af73d184d4a11bfcfc8f7 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:40:21 -0400 Subject: [PATCH 06/16] Update web-deploy.yml --- .github/workflows/web-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml index 70c56f8..d757c4c 100644 --- a/.github/workflows/web-deploy.yml +++ b/.github/workflows/web-deploy.yml @@ -35,7 +35,7 @@ jobs: uses: docker/build-push-action@v6 with: context: ./web - file: Dockerfile + file: ./web/Dockerfile platforms: linux/amd64,linux/arm64 push: true tags: ${{ secrets.DOCKERHUB_USER }}/shiftsync:latest_web From d92a993dfc9b3a677fad9656c96646c6a14091d0 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:40:36 -0400 Subject: [PATCH 07/16] Update Dockerfile --- web/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/web/Dockerfile b/web/Dockerfile index 000bc80..fd9d901 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,5 @@ FROM node:20-alpine + WORKDIR /app COPY . ./web From cb330c84b434045cd0ab1a4ac7941bc85302a844 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:44:59 -0400 Subject: [PATCH 08/16] Update Dockerfile --- web/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/Dockerfile b/web/Dockerfile index fd9d901..940b9b5 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,6 +2,8 @@ FROM node:20-alpine WORKDIR /app +COPY package*.json ./web +COPY package-lock.json ./web COPY . ./web RUN npm ci From 367ef94fc6f4612f7fefa8ef269fd18322009214 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:47:14 -0400 Subject: [PATCH 09/16] Update Dockerfile --- web/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 940b9b5..eb852fa 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,9 +2,7 @@ FROM node:20-alpine WORKDIR /app -COPY package*.json ./web -COPY package-lock.json ./web -COPY . ./web +COPY . . RUN npm ci From b859378f3f52051d1851a6ffc2f5e64993d5f26c Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:51:43 -0400 Subject: [PATCH 10/16] Update Dockerfile --- web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/Dockerfile b/web/Dockerfile index eb852fa..fd9d901 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,7 +2,7 @@ FROM node:20-alpine WORKDIR /app -COPY . . +COPY . ./web RUN npm ci From 2f68810c170e91633ac140af79efcaf569d80096 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:55:29 -0400 Subject: [PATCH 11/16] Update Dockerfile --- web/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index fd9d901..e97c0e8 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,8 +2,6 @@ FROM node:20-alpine WORKDIR /app -COPY . ./web - RUN npm ci EXPOSE 8080 From 9be8ad6a98c02c6666ff92f535e5acdc22713cb5 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 09:58:21 -0400 Subject: [PATCH 12/16] Update Dockerfile --- web/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index e97c0e8..86f04bf 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,7 +1,5 @@ FROM node:20-alpine -WORKDIR /app - RUN npm ci EXPOSE 8080 From 16f60809904739d42f3dc15e02b1124c0f236c64 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 10:03:19 -0400 Subject: [PATCH 13/16] Update Dockerfile --- web/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/Dockerfile b/web/Dockerfile index 86f04bf..e3e2cf8 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,7 +1,13 @@ FROM node:20-alpine +WORKDIR /app + +COPY package*.json ./ + RUN npm ci +COPY . . + EXPOSE 8080 EXPOSE 5173 CMD ["npm", "run", "dev"] From e4cb8ef560f49772d8266bed5dd4582ba13e2d93 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 10:08:47 -0400 Subject: [PATCH 14/16] Update Dockerfile --- web/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/web/Dockerfile b/web/Dockerfile index e3e2cf8..fd85f70 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -8,6 +8,5 @@ RUN npm ci COPY . . -EXPOSE 8080 EXPOSE 5173 CMD ["npm", "run", "dev"] From 7b47f9ee40ef30d43b1fa1310f07fc1c56ba8b23 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 10:17:34 -0400 Subject: [PATCH 15/16] Update Dockerfile --- web/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index fd85f70..d0c9275 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,11 +2,12 @@ FROM node:20-alpine WORKDIR /app -COPY package*.json ./ +COPY ./web/package*.json ./ RUN npm ci -COPY . . +COPY ./web ./ +EXPOSE 8080 EXPOSE 5173 CMD ["npm", "run", "dev"] From 1cf290d95f27b113e45add270f19853ca715d7d3 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 10:19:14 -0400 Subject: [PATCH 16/16] Update Dockerfile --- web/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index d0c9275..48ec791 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,12 +2,11 @@ FROM node:20-alpine WORKDIR /app -COPY ./web/package*.json ./ +COPY ./package*.json ./ RUN npm ci -COPY ./web ./ +COPY . ./ -EXPOSE 8080 EXPOSE 5173 CMD ["npm", "run", "dev"]