Finalizing CI with 2 images

.gitlab-ci.yml

@@ -23,10 +23,17 @@ build:
     - export phpVersion=`/yq e .php $softwareVersions`
     - export composerVersion=`/yq e .composer $softwareVersions`
     - export drushVersion=`/yq e .drush $softwareVersions`
+    - export nginxVersion=`/yq e .nginx $softwareVersions`
     - echo $phpVersion
+      # This is not the common Authentication config, unknown reason why common config fails
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64)\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context $CI_PROJECT_DIR/images --dockerfile $CI_PROJECT_DIR/images/Dockerfile
-      --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_BRANCH}-${TAG}
+      # Image builder for Site-Builder
+    - /kaniko/executor --context "$CI_PROJECT_DIR/images" --dockerfile "$CI_PROJECT_DIR/images/Dockerfile"
+      --destination ${CI_REGISTRY_IMAGE}/site-builder:${CI_COMMIT_BRANCH}-${TAG}
       --build-arg PHP_VERSION=$phpVersion --build-arg COMPOSER_VERSION=$composerVersion --build-arg DRUSH_VERSION=$drushVersion;
+      # Image builder for nginx
+      #- /kaniko/executor --context $CI_PROJECT_DIR/images/nginx --dockerfile $CI_PROJECT_DIR/images/nginx/Dockerfile
+      #    --destination \$CI_REGISTRY_IMAGE/nginx:${CI_COMMIT_BRANCH}-${TAG}
+      #    --build-arg NGINX_VERSION=\$nginxVersion;
     - echo "Image pushed to ${CI_REGISTRY_IMAGE}/${CI_COMMIT_BRANCH}-${TAG}"
 

images/Dockerfile

@@ -86,7 +86,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
 # RUN composer clearcache; composer require drush/drush ${DRUSH_VERSION}; composer install;
 # ENV PATH=$PATH:/tmp/drush/vendor/bin
 
-COPY ./s2i/bin/ ./hooks/ /usr/libexec/s2i/
+# COPY ./s2i/bin/ ./hooks/ /usr/libexec/s2i/
 COPY ./php-fpm/fix-permissions /fix-permissions
 RUN chmod -R +x /usr/libexec/s2i/; \
     chmod +x /fix-permissions
@@ -101,7 +101,7 @@ ENV DRUPAL_APP_DIR /app
 ENV DRUPAL_OPERATIONS_DIR /operations
 
 # The following folders are copied from the CI environment during image build 
-COPY cern-drupal-distribution ${DRUPAL_APP_DIR}
+COPY ../../cern-drupal-distribution ${DRUPAL_APP_DIR}
 # Add scripts for Drupal operations
 COPY drupal-operations-scripts ${DRUPAL_OPERATIONS_DIR}
 RUN chmod +x ${DRUPAL_OPERATIONS_DIR}/*