From c419d44668c0de440ce7348d5e0d0db96ffdea94 Mon Sep 17 00:00:00 2001 From: Roy Jeong Date: Thu, 16 Jan 2025 16:09:47 -0800 Subject: [PATCH 1/2] with build version to see in UI --- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 0da613a90..4074e3968 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "vdyp", - "version": "0.0.1", + "version": "0.0.1.103", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vdyp", - "version": "0.0.1", + "version": "0.0.1.103", "license": "(MIT OR Apache-2.0)", "dependencies": { "@bcgov/bc-sans": "2.1.0", diff --git a/frontend/package.json b/frontend/package.json index 7a523af9d..bc4d87171 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "vdyp", - "version": "0.0.1", + "version": "0.0.1.103", "private": true, "type": "module", "description": "Variable Density Yield Projection", From b2620626d9f4395b81a6119a6db33f7ea2735aa3 Mon Sep 17 00:00:00 2001 From: Roy Jeong Date: Thu, 16 Jan 2025 16:22:39 -0800 Subject: [PATCH 2/2] copy root ca cert for upstream --- frontend/Dockerfile | 5 +++++ frontend/entrust_g2_ca.crt | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 frontend/entrust_g2_ca.crt diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 04c742e78..e3a6295da 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -18,6 +18,11 @@ RUN apk add --no-cache ca-certificates && \ mkdir -p /config/caddy /data/caddy && \ chown -R 1001:1001 /config/caddy /data/caddy +# Copy the root CA certificate to /etc/ssl/certs +ARG CONTEXT="./frontend" +COPY ${CONTEXT}/entrust_g2_ca.crt /etc/ssl/certs/entrust_g2_ca.crt +RUN update-ca-certificates + # Copy static files and run formatting ARG CONTEXT="./frontend" COPY --from=build /app/dist /srv diff --git a/frontend/entrust_g2_ca.crt b/frontend/entrust_g2_ca.crt new file mode 100644 index 000000000..2e23a6055 --- /dev/null +++ b/frontend/entrust_g2_ca.crt @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC +VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50 +cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs +IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz +dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy +NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu +dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt +dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0 +aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T +RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN +cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW +wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1 +U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0 +jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN +BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/ +jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ +Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v +1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R +nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH +VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g== +-----END CERTIFICATE-----