convert to multistage build

.gitlab-ci.yml

@@ -11,8 +11,6 @@ stages:
 awsauth:
   stage: awsauth
   image: registry.containers.it.osu.edu/cache/gitlab-org/cloud-deploy/aws-base:latest
-  rules:
-    - !reference [.default_rules, rules]
   script:
     - if [ "${AWS_ACCESS_KEY_ID}" = "" ]; then echo "Missing AWS_ACCESS_KEY_ID"; exit 1; fi
     - if [ "${AWS_SECRET_ACCESS_KEY}" = "" ]; then echo "Missing AWS_SECRET_ACCESS_KEY"; exit 1; fi
@@ -35,8 +33,6 @@ build:
   needs:
     - job: awsauth
       artifacts: true
-  rules:
-    - !reference [.default_rules, rules]
   script:
     - if [ $CI_COMMIT_REF_SLUG = "master" -o $CI_COMMIT_REF_SLUG = "main" ]; then TAG="latest"; fi
     - if [ "$AWS_ECR_TOKEN" != "" ]; then ECRARG="--destination ${AWS_ECR_REGISTRY}/${CI_PROJECT_NAME}:${TAG}"; fi
@@ -59,7 +55,7 @@ build:
       " > /kaniko/.docker/config.json
     - |
       /kaniko/executor \
-        --single-snapshot \
+        --single-snapshot --target main \
         --context "${CI_PROJECT_DIR}" \
         --git "branch=${CI_COMMIT_REF_SLUG},depth=1,single-branch=true,recurse-submodules=true,shallow-submodules=true" \
         --dockerfile "${CI_PROJECT_DIR}/Dockerfile" \
@@ -71,21 +67,8 @@ build:
       dotenv: build.env
 
 container_scanning:
-  rules:
-    - !reference [.default_rules, rules]
   dependencies:
     - build
 
 include:
   - template: Security/Container-Scanning.gitlab-ci.yml
-
-.default_rules:
-  rules:
-#    - changes:
-#      - "*.md"
-#      - ".*ignore"
-#      - Makefile
-#      - runlocal.sh
-#      - merge-from-base.sh
-#      when: never
-    - when: always

Dockerfile

-FROM code.osu.edu:5000/wh/containerimages/wheks-base
+FROM code.osu.edu:5000/wh/containerimages/wheks-base AS main
 LABEL maintainer="E. Stuart Hicks <hicks.367@osu.edu>"
 USER root
 
@@ -121,3 +121,9 @@ RUN mv -v /usr/sbin/suexec /usr/sbin/suexec.hide_me_or_i_confuse_mod_fcgid
 
 WORKDIR /var/www
 USER apache
+
+# Final squash & setup
+FROM scratch
+COPY --from=main / /
+WORKDIR /var/www
+USER apache

Makefile

 IMAGE = wheks-php84:fcgid
 
 build:
-	DOCKER_BUILDKIT=0 docker build --platform linux/amd64 --squash -t $(IMAGE) .
+	docker build --platform linux/amd64 -t $(IMAGE) .