Skip to content

Commit d542222

Browse files
authored
ci: removed ARGS and ENV from Dockerfile as envvars are RUNTIME and i… (#1838)
1 parent 41636e4 commit d542222

File tree

5 files changed

+1
-278
lines changed

5 files changed

+1
-278
lines changed

dops/Dockerfile

-76
Original file line numberDiff line numberDiff line change
@@ -31,82 +31,6 @@ RUN mkdir /.cache && chmod 777 /.cache
3131
# Set the working directory to /app inside the deployment container
3232
WORKDIR /app
3333

34-
# Set node to production
35-
ARG NODE_ENV
36-
ENV NODE_ENV=${NODE_ENV}
37-
38-
39-
ARG DB_TYPE
40-
ARG DOPS_API_LOG_LEVEL
41-
ARG DOPS_API_TYPEORM_LOG_LEVEL
42-
ARG DOPS_API_MAX_QUERY_EXECUTION_TIME_MS
43-
ARG DOPS_API_MSSQL_MAX_CONNECTION
44-
ARG MSSQL_HOST
45-
ARG MSSQL_PORT
46-
ARG MSSQL_DB
47-
ARG MSSQL_SA_USER
48-
ARG MSSQL_SA_PASSWORD
49-
ARG MSSQL_ENCRYPT
50-
ARG KEYCLOAK_ISSUER_URL
51-
ARG KEYCLOAK_AUDIENCE
52-
ARG KEYCLOAK_IGNORE_EXP
53-
ARG DOPS_CVSE_FORMS_CACHE_TTL_MS
54-
ARG OCIO_S3_ACCESSKEYID
55-
ARG OCIO_S3_BUCKET
56-
ARG OCIO_S3_PRESIGNED_URL_EXPIRY
57-
ARG OCIO_S3_ENDPOINT
58-
ARG OCIO_S3_KEY
59-
ARG OCIO_S3_SECRETACCESSKEY
60-
ARG CHES_TOKEN_URL
61-
ARG CHES_CLIENT_ID
62-
ARG CHES_CLIENT_SECRET
63-
ARG CHES_URL
64-
ARG CDOGS_TOKEN_URL
65-
ARG CDOGS_CLIENT_ID
66-
ARG CDOGS_CLIENT_SECRET
67-
ARG CDOGS_URL
68-
ARG ACCESS_API_URL
69-
ARG DOPS_URL
70-
ARG FRONTEND_URL
71-
ARG ORBC_SERVICE_ACCOUNT_CLIENT_ID
72-
ARG ORBC_SERVICE_ACCOUNT_AUDIENCE
73-
74-
# Set environment variables
75-
ENV DB_TYPE=${DB_TYPE}
76-
ENV DOPS_API_LOG_LEVEL=${DOPS_API_LOG_LEVEL}
77-
ENV DOPS_API_TYPEORM_LOG_LEVEL=${DOPS_API_TYPEORM_LOG_LEVEL}
78-
ENV DOPS_API_MAX_QUERY_EXECUTION_TIME_MS=${DOPS_API_MAX_QUERY_EXECUTION_TIME_MS}
79-
ENV DOPS_API_MSSQL_MAX_CONNECTION=${DOPS_API_MSSQL_MAX_CONNECTION}
80-
ENV MSSQL_HOST=${MSSQL_HOST}
81-
ENV MSSQL_PORT=${MSSQL_PORT}
82-
ENV MSSQL_DB=${MSSQL_DB}
83-
ENV MSSQL_SA_USER=${MSSQL_SA_USER}
84-
ENV MSSQL_SA_PASSWORD=${MSSQL_SA_PASSWORD}
85-
ENV MSSQL_ENCRYPT=${MSSQL_ENCRYPT}
86-
ENV KEYCLOAK_ISSUER_URL=${KEYCLOAK_ISSUER_URL}
87-
ENV KEYCLOAK_AUDIENCE=${KEYCLOAK_AUDIENCE}
88-
ENV KEYCLOAK_IGNORE_EXP=${KEYCLOAK_IGNORE_EXP}
89-
ENV DOPS_CVSE_FORMS_CACHE_TTL_MS=${DOPS_CVSE_FORMS_CACHE_TTL_MS}
90-
ENV OCIO_S3_ACCESSKEYID=${OCIO_S3_ACCESSKEYID}
91-
ENV OCIO_S3_BUCKET=${OCIO_S3_BUCKET}
92-
ENV OCIO_S3_PRESIGNED_URL_EXPIRY=${OCIO_S3_PRESIGNED_URL_EXPIRY}
93-
ENV OCIO_S3_ENDPOINT=${OCIO_S3_ENDPOINT}
94-
ENV OCIO_S3_KEY=${OCIO_S3_KEY}
95-
ENV OCIO_S3_SECRETACCESSKEY=${OCIO_S3_SECRETACCESSKEY}
96-
ENV CHES_TOKEN_URL=${CHES_TOKEN_URL}
97-
ENV CHES_CLIENT_ID=${CHES_CLIENT_ID}
98-
ENV CHES_CLIENT_SECRET=${CHES_CLIENT_SECRET}
99-
ENV CHES_URL=${CHES_URL}
100-
ENV CDOGS_TOKEN_URL=${CDOGS_TOKEN_URL}
101-
ENV CDOGS_CLIENT_ID=${CDOGS_CLIENT_ID}
102-
ENV CDOGS_CLIENT_SECRET=${CDOGS_CLIENT_SECRET}
103-
ENV CDOGS_URL=${CDOGS_URL}
104-
ENV ACCESS_API_URL=${ACCESS_API_URL}
105-
ENV DOPS_URL=${DOPS_URL}
106-
ENV FRONTEND_URL=${FRONTEND_URL}
107-
ENV ORBC_SERVICE_ACCOUNT_CLIENT_ID=${ORBC_SERVICE_ACCOUNT_CLIENT_ID}
108-
ENV ORBC_SERVICE_ACCOUNT_AUDIENCE=${ORBC_SERVICE_ACCOUNT_AUDIENCE}
109-
11034
# Copy production files from build
11135
COPY --from=builder /app/package*.json ./
11236
COPY --from=builder /app/node_modules ./node_modules

frontend/Dockerfile

-16
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,6 @@ FROM node:22.14.0-alpine AS builder
33
# Set the working directory to /app inside the container
44
WORKDIR /app
55

6-
# Set variables
7-
#ENV NODE_ENV production
8-
ARG VITE_DEPLOY_ENVIRONMENT
9-
ARG VITE_API_VEHICLE_URL
10-
ARG VITE_POLICY_URL
11-
ARG VITE_KEYCLOAK_ISSUER_URL
12-
ARG VITE_KEYCLOAK_AUDIENCE
13-
ARG VITE_SITEMINDER_LOG_OFF_URL
14-
15-
ENV VITE_DEPLOY_ENVIRONMENT=$VITE_DEPLOY_ENVIRONMENT
16-
ENV VITE_API_VEHICLE_URL=$VITE_API_VEHICLE_URL
17-
ENV VITE_POLICY_URL=$VITE_POLICY_URL
18-
ENV VITE_KEYCLOAK_ISSUER_URL=$VITE_KEYCLOAK_ISSUER_URL
19-
ENV VITE_KEYCLOAK_AUDIENCE=$VITE_KEYCLOAK_AUDIENCE
20-
ENV VITE_SITEMINDER_LOG_OFF_URL=$VITE_SITEMINDER_LOG_OFF_URL
21-
226
# Install app dependencies
237
COPY ./package*.json ./
248

policy/Dockerfile

+1-41
Original file line numberDiff line numberDiff line change
@@ -27,46 +27,6 @@ RUN mkdir /.npm && chmod 777 /.npm
2727
# Set the working directory to /app inside the deployment container
2828
WORKDIR /app
2929

30-
# Set node to production
31-
ARG NODE_ENV
32-
ENV NODE_ENV=${NODE_ENV}
33-
34-
35-
ARG DB_TYPE
36-
ARG POLICY_API_LOG_LEVEL
37-
ARG POLICY_API_TYPEORM_LOG_LEVEL
38-
ARG POLICY_API_MAX_QUERY_EXECUTION_TIME_MS
39-
ARG POLICY_API_MSSQL_MAX_CONNECTION
40-
ARG MSSQL_HOST
41-
ARG MSSQL_PORT
42-
ARG MSSQL_DB
43-
ARG MSSQL_SA_USER
44-
ARG MSSQL_SA_PASSWORD
45-
ARG MSSQL_ENCRYPT
46-
ARG KEYCLOAK_ISSUER_URL
47-
ARG KEYCLOAK_AUDIENCE
48-
ARG KEYCLOAK_IGNORE_EXP
49-
ARG ORBC_SERVICE_ACCOUNT_CLIENT_ID
50-
ARG ORBC_SERVICE_ACCOUNT_AUDIENCE
51-
52-
# Set environment variables
53-
ENV DB_TYPE=${DB_TYPE}
54-
ENV POLICY_API_LOG_LEVEL=${POLICY_API_LOG_LEVEL}
55-
ENV POLICY_API_TYPEORM_LOG_LEVEL=${POLICY_API_TYPEORM_LOG_LEVEL}
56-
ENV POLICY_API_MAX_QUERY_EXECUTION_TIME_MS=${POLICY_API_MAX_QUERY_EXECUTION_TIME_MS}
57-
ENV POLICY_API_MSSQL_MAX_CONNECTION=${POLICY_API_MSSQL_MAX_CONNECTION}
58-
ENV MSSQL_HOST=${MSSQL_HOST}
59-
ENV MSSQL_PORT=${MSSQL_PORT}
60-
ENV MSSQL_DB=${MSSQL_DB}
61-
ENV MSSQL_SA_USER=${MSSQL_SA_USER}
62-
ENV MSSQL_SA_PASSWORD=${MSSQL_SA_PASSWORD}
63-
ENV MSSQL_ENCRYPT=${MSSQL_ENCRYPT}
64-
ENV KEYCLOAK_ISSUER_URL=${KEYCLOAK_ISSUER_URL}
65-
ENV KEYCLOAK_AUDIENCE=${KEYCLOAK_AUDIENCE}
66-
ENV KEYCLOAK_IGNORE_EXP=${KEYCLOAK_IGNORE_EXP}
67-
ENV ORBC_SERVICE_ACCOUNT_CLIENT_ID=${ORBC_SERVICE_ACCOUNT_CLIENT_ID}
68-
ENV ORBC_SERVICE_ACCOUNT_AUDIENCE=${ORBC_SERVICE_ACCOUNT_AUDIENCE}
69-
7030
# Copy production files from build
7131
COPY --from=builder /app/package*.json ./
7232
COPY --from=builder /app/node_modules ./node_modules
@@ -84,4 +44,4 @@ USER node
8444
CMD ["npm", "run", "start:prod"]
8545

8646
# Health check
87-
HEALTHCHECK --interval=30s --timeout=3s CMD curl -f http://localhost:5002/
47+
HEALTHCHECK --interval=30s --timeout=3s CMD curl -f http://localhost:5002/

scheduler/Dockerfile

-82
Original file line numberDiff line numberDiff line change
@@ -27,88 +27,6 @@ RUN mkdir /.npm && chmod 777 /.npm
2727
# Set the working directory to /app inside the deployment container
2828
WORKDIR /app
2929

30-
# Set node to production
31-
ARG NODE_ENV
32-
ENV NODE_ENV=${NODE_ENV}
33-
34-
35-
ARG DB_TYPE
36-
ARG SCHEDULER_API_LOG_LEVEL
37-
ARG SCHEDULER_API_TYPEORM_LOG_LEVEL
38-
ARG SCHEDULER_API_MAX_QUERY_EXECUTION_TIME_MS
39-
ARG SCHEDULER_API_MSSQL_MAX_CONNECTION
40-
ARG MSSQL_HOST
41-
ARG MSSQL_PORT
42-
ARG MSSQL_DB
43-
ARG MSSQL_SA_USER
44-
ARG MSSQL_SA_PASSWORD
45-
ARG MSSQL_ENCRYPT
46-
ARG KEYCLOAK_ISSUER_URL
47-
ARG KEYCLOAK_AUDIENCE
48-
ARG KEYCLOAK_IGNORE_EXP
49-
ARG OCIO_S3_ACCESSKEYID
50-
ARG OCIO_S3_BUCKET
51-
ARG OCIO_S3_PRESIGNED_URL_EXPIRY
52-
ARG OCIO_S3_ENDPOINT
53-
ARG OCIO_S3_KEY
54-
ARG OCIO_S3_SECRETACCESSKEY
55-
ARG TPS_POLL_LIMIT
56-
ARG TPS_PENDING_POLLING_INTERVAL
57-
ARG TPS_ERROR_POLLING_INTERVAL
58-
ARG TPS_MONITORING_POLLING_INTERVAL
59-
ARG CFS_PRIVATE_KEY
60-
ARG CFS_PRIVATE_KEY_PASSPHRASE
61-
ARG CFS_SFTP_USERNAME
62-
ARG CFS_SFTP_HOST
63-
ARG CFS_SFTP_PORT
64-
ARG CFS_REMOTE_PATH
65-
ARG ORBC_SERVICE_ACCOUNT_CLIENT_ID
66-
ARG ORBC_SERVICE_ACCOUNT_CLIENT_SECRET
67-
ARG ORBC_SERVICE_ACCOUNT_TOKEN_URL
68-
ARG ACCESS_API_URL
69-
ARG ISSUE_PERMIT_LIMIT
70-
ARG DOC_GEN_LIMIT
71-
ARG PERMIT_SCHEDULE_POLLING_INTERVAL
72-
73-
# Set environment variables
74-
ENV DB_TYPE=${DB_TYPE}
75-
ENV SCHEDULER_API_LOG_LEVEL=${SCHEDULER_API_LOG_LEVEL}
76-
ENV SCHEDULER_API_TYPEORM_LOG_LEVEL=${SCHEDULER_API_TYPEORM_LOG_LEVEL}
77-
ENV SCHEDULER_API_MAX_QUERY_EXECUTION_TIME_MS=${SCHEDULER_API_MAX_QUERY_EXECUTION_TIME_MS}
78-
ENV SCHEDULER_API_MSSQL_MAX_CONNECTION=${SCHEDULER_API_MSSQL_MAX_CONNECTION}
79-
ENV MSSQL_HOST=${MSSQL_HOST}
80-
ENV MSSQL_PORT=${MSSQL_PORT}
81-
ENV MSSQL_DB=${MSSQL_DB}
82-
ENV MSSQL_SA_USER=${MSSQL_SA_USER}
83-
ENV MSSQL_SA_PASSWORD=${MSSQL_SA_PASSWORD}
84-
ENV MSSQL_ENCRYPT=${MSSQL_ENCRYPT}
85-
ENV KEYCLOAK_ISSUER_URL=${KEYCLOAK_ISSUER_URL}
86-
ENV KEYCLOAK_AUDIENCE=${KEYCLOAK_AUDIENCE}
87-
ENV KEYCLOAK_IGNORE_EXP=${KEYCLOAK_IGNORE_EXP}
88-
ENV OCIO_S3_ACCESSKEYID=${OCIO_S3_ACCESSKEYID}
89-
ENV OCIO_S3_BUCKET=${OCIO_S3_BUCKET}
90-
ENV OCIO_S3_PRESIGNED_URL_EXPIRY=${OCIO_S3_PRESIGNED_URL_EXPIRY}
91-
ENV OCIO_S3_ENDPOINT=${OCIO_S3_ENDPOINT}
92-
ENV OCIO_S3_KEY=${OCIO_S3_KEY}
93-
ENV OCIO_S3_SECRETACCESSKEY=${OCIO_S3_SECRETACCESSKEY}
94-
ENV TPS_POLL_LIMIT=${TPS_POLL_LIMIT}
95-
ENV TPS_PENDING_POLLING_INTERVAL=${TPS_PENDING_POLLING_INTERVAL}
96-
ENV TPS_ERROR_POLLING_INTERVAL=${TPS_ERROR_POLLING_INTERVAL}
97-
ENV TPS_MONITORING_POLLING_INTERVAL=${TPS_MONITORING_POLLING_INTERVAL}
98-
ENV CFS_PRIVATE_KEY=${CFS_PRIVATE_KEY}
99-
ENV CFS_PRIVATE_KEY_PASSPHRASE=${CFS_PRIVATE_KEY_PASSPHRASE}
100-
ENV CFS_SFTP_USERNAME=${CFS_SFTP_USERNAME}
101-
ENV CFS_SFTP_HOST=${CFS_SFTP_HOST}
102-
ENV CFS_SFTP_PORT=${CFS_SFTP_PORT}
103-
ENV CFS_REMOTE_PATH=${CFS_REMOTE_PATH}
104-
ENV ORBC_SERVICE_ACCOUNT_CLIENT_ID=${ORBC_SERVICE_ACCOUNT_CLIENT_ID}
105-
ENV ORBC_SERVICE_ACCOUNT_CLIENT_SECRET=${ORBC_SERVICE_ACCOUNT_CLIENT_SECRET}
106-
ENV ORBC_SERVICE_ACCOUNT_TOKEN_URL=${ORBC_SERVICE_ACCOUNT_TOKEN_URL}
107-
ENV ACCESS_API_URL=${ACCESS_API_URL}
108-
ENV ISSUE_PERMIT_LIMIT=${ISSUE_PERMIT_LIMIT}
109-
ENV DOC_GEN_LIMIT=${DOC_GEN_LIMIT}
110-
ENV PERMIT_SCHEDULE_POLLING_INTERVAL=${PERMIT_SCHEDULE_POLLING_INTERVAL}
111-
11230
# Copy production files from build
11331
COPY --from=builder /app/package*.json ./
11432
COPY --from=builder /app/node_modules ./node_modules

vehicles/Dockerfile

-63
Original file line numberDiff line numberDiff line change
@@ -27,69 +27,6 @@ RUN mkdir /.npm && chmod 777 /.npm
2727
# Set the working directory to /app inside the deployment container
2828
WORKDIR /app
2929

30-
# Set node to production
31-
ARG NODE_ENV
32-
ENV NODE_ENV=${NODE_ENV}
33-
34-
35-
ARG DB_TYPE
36-
ARG VEHICLES_API_LOG_LEVEL
37-
ARG VEHICLES_API_TYPEORM_LOG_LEVEL
38-
ARG VEHICLES_API_MAX_QUERY_EXECUTION_TIME_MS
39-
ARG VEHICLES_API_MSSQL_MAX_CONNECTION
40-
ARG MSSQL_HOST
41-
ARG MSSQL_PORT
42-
ARG MSSQL_DB
43-
ARG MSSQL_SA_USER
44-
ARG MSSQL_SA_PASSWORD
45-
ARG MSSQL_ENCRYPT
46-
ARG KEYCLOAK_ISSUER_URL
47-
ARG KEYCLOAK_AUDIENCE
48-
ARG KEYCLOAK_IGNORE_EXP
49-
ARG ACCESS_API_URL
50-
ARG DOPS_URL
51-
ARG FRONTEND_URL
52-
ARG PAYBC_API_KEY
53-
ARG PAYBC_REF_NUMBER
54-
ARG PAYBC_BASE_URL
55-
ARG GL_CODE
56-
ARG PAYBC_REDIRECT
57-
ARG ORBC_SERVICE_ACCOUNT_CLIENT_ID
58-
ARG ORBC_SERVICE_ACCOUNT_AUDIENCE
59-
ARG CFS_CREDIT_ACCOUNT_URL
60-
ARG CFS_CREDIT_ACCOUNT_CLIENT_ID
61-
ARG CFS_CREDIT_ACCOUNT_CLIENT_SECRET
62-
ARG BCGOV_FAX_EMAIL
63-
# Set environment variables
64-
ENV DB_TYPE=${DB_TYPE}
65-
ENV VEHICLES_API_LOG_LEVEL=${VEHICLES_API_LOG_LEVEL}
66-
ENV VEHICLES_API_TYPEORM_LOG_LEVEL=${VEHICLES_API_TYPEORM_LOG_LEVEL}
67-
ENV VEHICLES_API_MAX_QUERY_EXECUTION_TIME_MS=${VEHICLES_API_MAX_QUERY_EXECUTION_TIME_MS}
68-
ENV VEHICLES_API_MSSQL_MAX_CONNECTION=${VEHICLES_API_MSSQL_MAX_CONNECTION}
69-
ENV MSSQL_HOST=${MSSQL_HOST}
70-
ENV MSSQL_PORT=${MSSQL_PORT}
71-
ENV MSSQL_DB=${MSSQL_DB}
72-
ENV MSSQL_SA_USER=${MSSQL_SA_USER}
73-
ENV MSSQL_SA_PASSWORD=${MSSQL_SA_PASSWORD}
74-
ENV MSSQL_ENCRYPT=${MSSQL_ENCRYPT}
75-
ENV KEYCLOAK_ISSUER_URL=${KEYCLOAK_ISSUER_URL}
76-
ENV KEYCLOAK_AUDIENCE=${KEYCLOAK_AUDIENCE}
77-
ENV KEYCLOAK_IGNORE_EXP=${KEYCLOAK_IGNORE_EXP}
78-
ENV ACCESS_API_URL=${ACCESS_API_URL}
79-
ENV DOPS_URL=${DOPS_URL}
80-
ENV FRONTEND_URL=${FRONTEND_URL}
81-
ENV PAYBC_API_KEY=${PAYBC_API_KEY}
82-
ENV PAYBC_REF_NUMBER=${PAYBC_REF_NUMBER}
83-
ENV PAYBC_BASE_URL=${PAYBC_BASE_URL}
84-
ENV GL_CODE=${GL_CODE}
85-
ENV PAYBC_REDIRECT=${PAYBC_REDIRECT}
86-
ENV ORBC_SERVICE_ACCOUNT_CLIENT_ID=${ORBC_SERVICE_ACCOUNT_CLIENT_ID}
87-
ENV ORBC_SERVICE_ACCOUNT_AUDIENCE=${ORBC_SERVICE_ACCOUNT_AUDIENCE}
88-
ENV CFS_CREDIT_ACCOUNT_URL=${CFS_CREDIT_ACCOUNT_URL}
89-
ENV CFS_CREDIT_ACCOUNT_CLIENT_ID=${CFS_CREDIT_ACCOUNT_CLIENT_ID}
90-
ENV CFS_CREDIT_ACCOUNT_CLIENT_SECRET=${CFS_CREDIT_ACCOUNT_CLIENT_SECRET}
91-
ENV BCGOV_FAX_EMAIL=${BCGOV_FAX_EMAIL}
92-
9330
# Copy production files from build
9431
COPY --from=builder /app/package*.json ./
9532
COPY --from=builder /app/node_modules ./node_modules

0 commit comments

Comments
 (0)