From caa2f2a161d18cb533d1cb47a6f40de73ded9763 Mon Sep 17 00:00:00 2001 From: Alan Bridgeman Date: Tue, 10 Jun 2025 11:34:57 -0500 Subject: [PATCH 1/3] Attempting to fix automation problems --- Dockerfile | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 76817c9..aa5f7be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /usr/src/app # Install app dependencies COPY package*.json ./ COPY .npmrc ./ -COPY yarn.lock ./ +#COPY yarn.lock ./ RUN yarn install --frozen-lockfile # Build and test diff --git a/package.json b/package.json index 7c5c066..5b405a2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ba-website", - "version": "1.0.16", + "version": "1.0.17", "description": "The Bridgeman Accessible main website", "main": "server.js", "scripts": { From 65b7aa9d4cc2ae610caf1e2999309793c96a6551 Mon Sep 17 00:00:00 2001 From: Alan Bridgeman Date: Tue, 10 Jun 2025 11:52:34 -0500 Subject: [PATCH 2/3] Had commented out the wrong line in the Dockerfile --- Dockerfile | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa5f7be..5d9ebd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ WORKDIR /usr/src/app # Install app dependencies COPY package*.json ./ -COPY .npmrc ./ -#COPY yarn.lock ./ +#COPY .npmrc ./ +COPY yarn.lock ./ RUN yarn install --frozen-lockfile # Build and test diff --git a/package.json b/package.json index 5b405a2..b2956bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ba-website", - "version": "1.0.17", + "version": "1.0.18", "description": "The Bridgeman Accessible main website", "main": "server.js", "scripts": { From a1ef2e57e6f20b20a07ec4c3d8cfe387d82f67f7 Mon Sep 17 00:00:00 2001 From: Alan Bridgeman Date: Tue, 10 Jun 2025 11:56:46 -0500 Subject: [PATCH 3/3] Attempting to fix integrity issue when building the image --- package.json | 3 ++- yarn.lock | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b2956bb..81dd8b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ba-website", - "version": "1.0.18", + "version": "1.0.19", "description": "The Bridgeman Accessible main website", "main": "server.js", "scripts": { @@ -10,6 +10,7 @@ }, "dependencies": { "@BridgemanAccessible/ba-auth": "^1.0.0", + "@BridgemanAccessible/ba-logging": "^1.0.0", "@BridgemanAccessible/ba-web-framework": "^1.0.0", "@BridgemanAccessible/listmonk-node-client": "^1.0.0", "ejs": "^3.1.6", diff --git a/yarn.lock b/yarn.lock index 9df5ef4..43d74ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,8 +22,8 @@ "@BridgemanAccessible/ba-logging@^1.0.0": version "1.0.0" - resolved "https://npm.pkg.bridgemanaccessible.ca/@BridgemanAccessible/ba-logging/-/ba-logging-1.0.0.tgz#354bbf9c4e9e8c6e72b9e3e4b353519aac54f6a2" - integrity sha512-LOkh1PL7U31NVtZrWOLRbPvmBchE/Mp1CzTWwFDRch9lTAITYvfrPLhWcBLDm98sE64fBluMqeok8ZEfqPoq2Q== + resolved "https://npm.pkg.bridgemanaccessible.ca/@BridgemanAccessible/ba-logging/-/ba-logging-1.0.0.tgz#367c4aa6fbc5278073f9750f76406e2a25aba9df" + integrity sha512-PuryL6BIrZgny8iKDPrZSoOwrGvr2kDVpKjNzJk6Z1o16vbxNRguU0hHCPCYVhpxdgFORJfH6GJlgY4kkk8Qlg== dependencies: axios "^1.8.4" express "^4.21.2"