Disable LCFS_RELOAD (#1389)

Update build config to use pullSecret
bcgov · Dec 6, 2024 · 20e45d6 · 20e45d6
1 parent 5e0a115
commit 20e45d6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/backend/Dockerfile.openshift b/backend/Dockerfile.openshift
@@ -23,9 +23,9 @@ ENV POETRY_CACHE_DIR=/.cache/pypoetry
 RUN poetry install --only main
 
 # Removing gcc
-# RUN apt-get purge -y \
-#   gcc \
-#   && rm -rf /var/lib/apt/lists/*
+RUN apt-get purge -y \
+  gcc \
+  && rm -rf /var/lib/apt/lists/*
 
 # Copying the actual application, wait-for-it script, and prestart script
 COPY . /app/
@@ -45,4 +45,4 @@ RUN chmod +x /app/wait-for-it.sh /app/lcfs/prestart.sh /app/lcfs/start.sh
 # Set the APP_ENVIRONMENT variable to 'production'
 ENV APP_ENVIRONMENT=prod
 
-CMD ["/app/lcfs/start.sh"]
+CMD ["/app/lcfs/start.sh"]
diff --git a/openshift/templates/backend-bc.yaml b/openshift/templates/backend-bc.yaml
@@ -59,16 +59,9 @@ objects:
     strategy:
       dockerStrategy:
         dockerfilePath: ./Dockerfile.openshift
-        env:
-          - name: ARTIFACTORY_USER
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-gyszor
-                key: username
-          - name: ARTIFACTORY_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-gyszor
-                key: password
+        pullSecret:
+          name: artifacts-pull-default-gyszor
+        forcePull: true
+        noCache: true    
       type: Docker
     triggers: []
diff --git a/openshift/templates/frontend-bc.yaml b/openshift/templates/frontend-bc.yaml
@@ -59,16 +59,9 @@ objects:
     strategy:
       dockerStrategy:
         dockerfilePath: ./Dockerfile.openshift
-        env:
-          - name: ARTIFACTORY_USER
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-gyszor
-                key: username
-          - name: ARTIFACTORY_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: artifacts-default-gyszor
-                key: password
+        pullSecret:
+          name: artifacts-pull-default-gyszor
+        forcePull: true
+        noCache: true    
       type: Docker
     triggers: []