Convert to single, multi-stage Dockerfile

This allows us to take actually advantage of cached layers from the
Docker build. Otherwise, the child image builds were pulling images from DockerHub

Author: brianhlin

.github/workflows/build-container.yml

@@ -37,24 +37,15 @@ jobs:
         path: /tmp/.buildx-cache
         key: base-${{ matrix.repo }}-buildx-${{ github.sha }}
 
-    - name: Generate tag list
-      id: generate-tag-list
-      env:
-        REPO: ${{ matrix.repo }}
-      run: |
-        docker_repo=${GITHUB_REPOSITORY/opensciencegrid\/docker-/opensciencegrid/}
-        echo "::set-output name=taglist::$docker_repo:$REPO"
-
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
 
     - name: Build Docker image
       uses: docker/[email protected]
       with:
         build-args: BASE_YUM_REPO=${{ matrix.repo }}
-        tags: "${{ steps.generate-tag-list.outputs.taglist }}"
-        context: base
-        cache-to: type=local,dest=/tmp/.buildx-cache
+        target: base
+        cache-to: type=local,mode=max,dest=/tmp/.buildx-cache
 
   child-image-builds:
     name: ${{ matrix.image }}:${{ matrix.repo }} image build
@@ -102,5 +93,5 @@ jobs:
         push: True
         build-args: BASE_YUM_REPO=${{ matrix.repo }}
         tags: "${{ steps.generate-tag-list.outputs.taglist }}"
-        context: ${{ matrix.image }}
+        target: ${{ matrix.image }}
         cache-from: type=local,src=/tmp/.buildx-cache

Dockerfile

@@ -1,10 +1,14 @@
+########
+# base #
+########
+
 # Specify the opensciencegrid/software-base image tag
 ARG BASE_YUM_REPO=release
 
-FROM opensciencegrid/software-base:$BASE_YUM_REPO
-
+FROM opensciencegrid/software-base:$BASE_YUM_REPO AS base
 LABEL maintainer "OSG Software <[email protected]>"
 
+# previous arg has gone out of scope
 ARG BASE_YUM_REPO=release
 
 # Ensure that the 'condor' UID/GID matches across containers
@@ -31,15 +35,87 @@ RUN if [[ $BASE_YUM_REPO = release ]]; then \
     yum clean all && \
     rm -rf /var/cache/yum/
 
-COPY etc/osg/image-config.d/* /etc/osg/image-config.d/
-COPY etc/condor-ce/config.d/* /usr/share/condor-ce/config.d/
-COPY usr/local/bin/* /usr/local/bin/
-COPY etc/supervisord.d/* /etc/supervisord.d/
+COPY base/etc/osg/image-config.d/* /etc/osg/image-config.d/
+COPY base/etc/condor-ce/config.d/* /usr/share/condor-ce/config.d/
+COPY base/usr/local/bin/* /usr/local/bin/
+COPY base/etc/supervisord.d/* /etc/supervisord.d/
 
 # do the bad thing of overwriting the existing cron job for fetch-crl
-ADD etc/cron.d/fetch-crl /etc/cron.d/fetch-crl
+ADD base/etc/cron.d/fetch-crl /etc/cron.d/fetch-crl
 RUN chmod 644 /etc/cron.d/fetch-crl
 
 # HACK: override condor_ce_jobmetrics from SOFTWARE-4183 until it is released in
 # HTCondor-CE.
-COPY overrides/condor_ce_jobmetrics /usr/share/condor-ce/condor_ce_jobmetrics
+COPY base/overrides/condor_ce_jobmetrics /usr/share/condor-ce/condor_ce_jobmetrics
+
+#################
+# osg-ce-condor #
+#################
+
+FROM base AS osg-ce-condor
+ARG BASE_YUM_REPO=release
+LABEL maintainer "OSG Software <[email protected]>"
+
+RUN if [[ $BASE_YUM_REPO = release ]]; then \
+       yumrepo=osg-upcoming; else \
+       yumrepo=osg-upcoming-$BASE_YUM_REPO; fi && \
+     yum install -y --enablerepo=$yumrepo \
+                   osg-ce-condor && \
+    yum clean all && \
+    rm -rf /var/cache/yum/
+
+COPY osg-ce-condor/etc/osg/image-config.d/* /etc/osg/image-config.d/
+COPY osg-ce-condor/etc/condor/config.d/* /etc/condor/config.d/
+COPY osg-ce-condor/usr/local/bin/* /usr/local/bin/
+COPY osg-ce-condor/etc/supervisord.d/* /etc/supervisord.d/
+
+#############
+# hosted-ce #
+#############
+
+FROM base AS hosted-ce
+LABEL maintainer "OSG Software <[email protected]>"
+
+ARG BASE_YUM_REPO=release
+
+RUN if [[ $BASE_YUM_REPO = release ]]; then \
+       yumrepo=osg-upcoming; else \
+       yumrepo=osg-upcoming-$BASE_YUM_REPO; fi && \
+    yum install -y --enablerepo=$yumrepo \
+                   osg-ce-bosco && \
+    rm -rf /var/cache/yum/
+
+COPY hosted-ce/30-remote-site-setup.sh /etc/osg/image-config.d/
+
+# HACK: override condor_ce_jobmetrics from SOFTWARE-4183 until it is released in
+# HTCondor-CE.
+ADD hosted-ce/overrides/condor_ce_jobmetrics /usr/share/condor-ce/condor_ce_jobmetrics
+
+# Use "ssh -q" in bosco_cluster until the chang has been upstreamed to condor
+COPY hosted-ce/overrides/ssh_q.patch /tmp
+RUN patch -d / -p0 < /tmp/ssh_q.patch
+
+# Enable bosco_cluster xtrace
+COPY hosted-ce/overrides/bosco_cluster_xtrace.patch /tmp
+RUN patch -d / -p0 < /tmp/bosco_cluster_xtrace.patch
+
+# HACK: Don't copy over the SSH pub key to the remote side. We set
+# this up with the site out of band.
+COPY hosted-ce/overrides/skip_key_copy.patch /tmp
+RUN patch -d / -p0 < /tmp/skip_key_copy.patch
+
+# Fix Ubuntu20 OS detection (SOFTWARE-4463)
+# Can be dropped when HTCONDOR-242 is involved
+COPY hosted-ce/overrides/HTCONDOR-242.remote-os-detection.patch /tmp
+RUN [[ $BASE_YUM_REPO == 'development' ]] || patch -d / -p0 < /tmp/HTCONDOR-242.remote-os-detection.patch
+
+# Set up Bosco override dir from Git repo (SOFTWARE-3903)
+# Expects a Git repo with the following directory structure:
+#     RESOURCE_NAME_1/
+#         bosco_override/
+#         ...
+#     RESOURCE_NAME_2/
+#         bosco_override/
+#         ...
+#     ...
+COPY hosted-ce/bosco-override-setup.sh /usr/local/bin