Merge branch 'main' into feat/FSADT1-1631

bcgov · Dec 18, 2024 · baf3c7b · baf3c7b
2 parents 3bf5232 + 7992e2f
commit baf3c7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -5,7 +5,7 @@ ARG APP_VERSION=0.0.1
 
 WORKDIR /app
 COPY . .
-RUN npm ci && npm run build
+RUN npm ci --ignore-scripts && npm install @esbuild/linux-x64 --no-save && npm run build
 
 # Caddy
 FROM caddy:2.8.4-alpine
@@ -24,7 +24,8 @@ RUN apk add --no-cache ca-certificates coreutils && \
 
 # Port, health check and non-root user
 EXPOSE 3000
-HEALTHCHECK --interval=30s --timeout=3s CMD curl -f http://localhost:3000/
+HEALTHCHECK --interval=30s --timeout=3s CMD ["curl", "-f", "http://localhost:3000/"]
+
 USER 1001
 
 CMD ["/bin/sh", "-c", ". /app/setenv.sh; caddy run --config /etc/caddy/Caddyfile --adapter caddyfile"]
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
@@ -662,7 +662,7 @@ cds-actionable-notification * {
   font-size: 0.875rem;
   font-style: normal;
   font-weight: 400;
-  line-height: 1.25rem;
+  line-height: 1.125rem;
   letter-spacing: 0.01rem;
 }
 
@@ -1624,6 +1624,10 @@ cds-header-panel[expanded] {
   margin-left: 1.75rem;
 }
 
+.no-margin {
+  margin: 0;
+}
+
 .no-padding {
   padding: 0;
 }