Skip to content

Commit

Permalink
Add back "-v2" to image name
Browse files Browse the repository at this point in the history
Now that we use the original image naming scheme, this needs to be added
back
  • Loading branch information
ekilmer committed Jan 9, 2024
1 parent 16ae60c commit 4a05501
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/vcpkg_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
env:
# This needs to be the same as in the `merge` job
# Also remember to change the 'docker/build.sh' script
REGISTRY_IMAGE: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu
REGISTRY_IMAGE: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu-v2
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- build
env:
# This needs to be the same as in the `build` job
REGISTRY_IMAGE: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu
REGISTRY_IMAGE: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu-v2
strategy:
fail-fast: false
matrix:
Expand Down
13 changes: 7 additions & 6 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ set -euo pipefail
# Ubuntu versions to build
UBUNTU_VERSION_MATRIX=( "22.04" "24.04" )

for version in "${UBUNTU_VERSION_MATRIX[@]}"; do
for ubuntu_version in "${UBUNTU_VERSION_MATRIX[@]}"; do
# Always pull from upstream
docker pull "ubuntu:${version}"
docker pull "ubuntu:${ubuntu_version}"

# Image identification. "v2" Image version is to identify big changes to the
# build toolchain like LLVM version
# Also remember to change the '.github/workflows/vcpkg_docker.yml' variable
# Image identification
image=vcpkg-builder-ubuntu
image="vcpkg-builder-ubuntu-v2"

# Build
docker build \
-f Dockerfile.ubuntu.vcpkg \
--no-cache \
--build-arg "UBUNTU_VERSION=${version}" \
-t "${image}:${version}" \
--build-arg "UBUNTU_VERSION=${ubuntu_version}" \
-t "${image}:${ubuntu_version}" \
.
done

0 comments on commit 4a05501

Please sign in to comment.