Skip to content

Commit

Permalink
Patch release
Browse files Browse the repository at this point in the history
  • Loading branch information
benc-uk committed Nov 9, 2021
1 parent 4d75906 commit d1c4f78
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 37 deletions.
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG ARCH=
ARG IMAGE_BASE=14-alpine

FROM ${ARCH}node:$IMAGE_BASE
LABEL Name="Node.js Demo App" Version=4.8.1
LABEL Name="Node.js Demo App" Version=4.8.2
LABEL org.opencontainers.image.source = "https://github.com/benc-uk/nodejs-demoapp"
ENV NODE_ENV production
WORKDIR /app
Expand Down
32 changes: 16 additions & 16 deletions src/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nodejs-demoapp",
"description": "Node.js Express app for demos",
"version": "4.8.1",
"version": "4.8.2",
"author": "Ben Coleman",
"engines": {
"node": ">=14.0.0"
Expand Down
43 changes: 24 additions & 19 deletions src/views/info.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@
<td><i class="fa fa-cube"></i></td>
<td>Containerized</td>
<% if (isContainer) { %>
<td>Looks like we're running in a container! 😁</td>
<td>Looks like we're running in a container! 😁</td>
<% } else { %>
<td>Not running as a container 😢</td>
<td>Not running as a container 😢</td>
<% } %>
</tr>
<tr>
<td><i class="fa fa-project-diagram"></i></td>
<td>Kubernetes</td>
<% if (isKube) { %>
<td>We're also running in a Kubernetes pod! 😃</td>
<td>We're also running in a Kubernetes pod! 😃</td>
<% } else { %>
<td>Not running in Kubernetes 😢</td>
<td>Not running in Kubernetes 😢</td>
<% } %>
</tr>

<tr>
<td>&nbsp;<i class="fas fa-lightbulb"></i></td>
<td>App Insights</td>
<% if (process.env.APPINSIGHTS_INSTRUMENTATIONKEY) { %>
<td>Reporting data to App Insights, nice job!</td>
<td>Reporting data to App Insights, nice job!</td>
<% } else { %>
<td>Not reporting data to App Insights</td>
<td>Not reporting data to App Insights</td>
<% } %>
</tr>

Expand Down Expand Up @@ -70,11 +70,11 @@
<td><%= info.nodever %></td>
</tr>
<% if (process.env.RELEASE_INFO) { %>
<tr>
<td><i class="fa fa-window-restore"></i></td>
<td>Release Info</td>
<td><%= process.env.RELEASE_INFO %></td>
</tr>
<tr>
<td><i class="fa fa-window-restore"></i></td>
<td>Release Info</td>
<td><%= process.env.RELEASE_INFO %></td>
</tr>
<% } %>
</table>
</div>
Expand All @@ -87,14 +87,19 @@
<div class="card-body">
<div class="envtable">
<table class="table table-hover">
<% for(let envVar in process.env) { %> <% if (envVar.toUpperCase().includes('SECRET')) continue %> <% if
(envVar.toUpperCase().includes('PWD')) continue %> <% if (envVar.toUpperCase().includes('PASSWORD')) continue %>
<% if (envVar.toUpperCase().includes('KEY')) continue %> <% if (envVar.toUpperCase().includes('PATH')) continue
%> <% if (envVar.toUpperCase().includes('NPM_')) continue %>
<tr>
<td><%= envVar %></td>
<td class="envvars"><%= process.env[envVar] %></td>
</tr>
<% for(let envVar in process.env) { %>
<% if (envVar.toUpperCase().includes('SECRET')) continue %>
<% if (envVar.toUpperCase().includes('PWD')) continue %>
<% if (envVar.toUpperCase().includes('PASSWORD')) continue %>
<% if (envVar.toUpperCase().includes('KEY')) continue %>
<% if (envVar.toUpperCase().includes('CONNSTR')) continue %>
<% if (envVar.toUpperCase().includes('PATH')) continue %>
<% if (envVar.toUpperCase().includes('NPM_')) continue %>
<% if (envVar.toUpperCase().includes('NPM_')) continue %>
<tr>
<td><%= envVar %></td>
<td class="envvars"><%= process.env[envVar] %></td>
</tr>
<% } %>
</table>
</div>
Expand Down

0 comments on commit d1c4f78

Please sign in to comment.