Skip to content

Commit 74275eb

Browse files
committed
Only push a single image, including mono for caching
If there are requests for a smaller image, this can be added later
1 parent 319a2e1 commit 74275eb

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

.github/workflows/vcpkg_docker_amd64.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
fi
5757
echo "IMAGE_NAME=ghcr.io/lifting-bits/cxx-common/${test_name}vcpkg-builder-ubuntu-${{ env.IMAGE_VER }}:${{ matrix.container.version }}${{ matrix.host.arch }}" >> ${GITHUB_ENV}
5858
59-
- name: Build caching image
59+
- name: Build image
6060
working-directory: docker
6161
run: |
6262
# Pull freshest ubuntu Docker image
@@ -72,18 +72,5 @@ jobs:
7272
- name: Log in to registry
7373
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
7474

75-
- name: Push caching image
75+
- name: Push image
7676
run: docker push "${IMAGE_NAME}"
77-
78-
- name: Build and Push non-caching image
79-
if: github.ref == 'refs/heads/master'
80-
working-directory: docker
81-
run: |
82-
# Only push smaller image on default branch. This could change in the
83-
# future if we actually need to test the smaller image before merging
84-
docker build -f Dockerfile.ubuntu.vcpkg \
85-
--target base \
86-
--build-arg "DISTRO_VERSION=${{ matrix.container.codename }}" \
87-
-t "${IMAGE_NAME}" \
88-
.
89-
docker push "${IMAGE_NAME}"

docker/Dockerfile.ubuntu.vcpkg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,3 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
5656
apt-get install --yes mono-devel && \
5757
apt-get clean --yes && \
5858
rm -rf /var/lib/apt/lists/*
59-
60-
# Only build base by default
61-
FROM base

0 commit comments

Comments
 (0)