Skip to content

Commit

Permalink
Merge pull request #2150 from weather-gov/jt/zscaler-pem-rename
Browse files Browse the repository at this point in the history
rename zscaler pem as it is a public cert
  • Loading branch information
jamestranovich-noaa authored Dec 4, 2024
2 parents c8cc7cd + af4e253 commit a033362
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN usermod -g ${GID} www-data

# Copy the zscaler root CA into the container and add it to the list of OpenSSL
# root certificates.
COPY zscaler-root.pem /etc/ssl/certs/zscaler-root.pem
COPY zscaler-root-public.cert /etc/ssl/certs/zscaler-root.pem
# Rebuild the CA cache. Otherwise the prior step is useless.
RUN c_rehash
# Tell PHP where to look for CAs. I dunno why it doesn't look here by default.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.plantuml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM plantuml/plantuml-server:jetty

# Copy the zscaler root CA into the container and add it to the list of OpenSSL
# root certificates.
COPY zscaler-root.pem /etc/ssl/certs/zscaler-root.pem
COPY zscaler-root-public.cert /etc/ssl/certs/zscaler-root.pem

# Put it in the Java keytool. Gotta be root for this.
USER root
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.uswds
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM node:20

COPY zscaler-root.pem /etc/ssl/certs/zscaler-root.pem
COPY zscaler-root.public-cert /etc/ssl/certs/zscaler-root.pem
RUN c_rehash
ENV NODE_EXTRA_CA_CERTS=/etc/ssl/certs/zscaler-root.pem

Expand All @@ -10,4 +10,4 @@ WORKDIR /app
ADD ./web/themes/new_weather_theme/package.json .
ADD ./web/themes/new_weather_theme/package-lock.json .

RUN npm ci
RUN npm ci
4 changes: 2 additions & 2 deletions Dockerfile.utility-node
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM node:20

COPY zscaler-root.pem /etc/ssl/certs/zscaler-root.pem
COPY zscaler-root.public.cert /etc/ssl/certs/zscaler-root.pem
RUN c_rehash
ENV NODE_EXTRA_CA_CERTS=/etc/ssl/certs/zscaler-root.pem

Expand All @@ -10,4 +10,4 @@ WORKDIR /app
ADD ./package.json .
ADD ./package-lock.json .

RUN npm ci
RUN npm ci
2 changes: 1 addition & 1 deletion spatial-data/Dockerfile.spatial
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM node:20

# Copy the zscaler root CA into the container and add it to the list of OpenSSL
# root certificates.
#COPY zscaler-root.pem /etc/ssl/certs/zscaler-root.pem
#COPY zscaler-root-public.cert /etc/ssl/certs/zscaler-root.pem
# Rebuild the CA cache. Otherwise the prior step is useless.
#RUN c_rehash

Expand Down
File renamed without changes.

0 comments on commit a033362

Please sign in to comment.