Skip to content
This repository has been archived by the owner on Feb 13, 2024. It is now read-only.

Commit

Permalink
Remove win 2019 build
Browse files Browse the repository at this point in the history
  • Loading branch information
harrisonmeister committed Jan 15, 2024
1 parent e1de183 commit 5d8621b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 76 deletions.
53 changes: 6 additions & 47 deletions .github/workflows/docker-build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
outputs:
VERSION: ${{ steps.step1.outputs.VERSION }}
CONTINUE: ${{ steps.step1.outputs.Continue }}
WIN2019_VERSION: ${{ steps.step1.outputs.WIN2019_VERSION }}
WIN2022_VERSION: ${{ steps.step1.outputs.WIN2022_VERSION }}
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -69,20 +68,15 @@ jobs:
{
Write-Output "We need to upgrade the container to $versionToCompare"
Write-Host "Getting OS versions for windows 2022 and 2019"
$win2019_manifest = (docker manifest inspect --verbose "octopuslabs/workertools:latest-windows.2019" | ConvertFrom-Json)
$WIN2019_VERSION = $win2019_manifest.Descriptor.Platform.'os.version'
Write-Host "WIN2019_VERSION: $WIN2019_VERSION"
Write-Host "Getting OS versions for windows 2022"
$win2022_manifest = (docker manifest inspect --verbose "octopuslabs/workertools:latest-windows.2022" | ConvertFrom-Json)
$WIN2022_VERSION = $win2022_manifest.Descriptor.Platform.'os.version'
Write-Host "WIN2022_VERSION: $WIN2022_VERSION"
if([string]::IsNullOrWhiteSpace($WIN2019_VERSION) -or [string]::IsNullOrWhiteSpace($WIN2022_VERSION)) {
throw "Could not establish OS versions for windows 2022 and 2019 needed for docker manifest"
if([string]::IsNullOrWhiteSpace($WIN2022_VERSION)) {
throw "Could not establish OS versions for windows 2022 needed for docker manifest"
}
echo "WIN2019_VERSION=$WIN2019_VERSION" >> $env:GITHUB_OUTPUT
echo "WIN2022_VERSION=$WIN2022_VERSION" >> $env:GITHUB_OUTPUT
Write-Host "We have everything we need, continuing."
Expand Down Expand Up @@ -138,37 +132,6 @@ jobs:
run: docker push octopuslabs/gcp-workertools:latest-ubuntu.2204
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

build-win-2019:
needs: [get-version-number]
runs-on: windows-2019

steps:
- uses: actions/checkout@v3

- name: DockerHub Login
env:
USERNAME: ${{ secrets.DOCKER_HUB_USER }}
PASSWORD: ${{ secrets.DOCKER_HUB_PAT }}
run: docker login --username ${env:USERNAME} --password "${env:PASSWORD}"
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

- name: Build the win2019 image
env:
VERSION_NUMBER: ${{ needs.get-version-number.outputs.VERSION }}
GOOGLE_CLOUD_CLI_VERSION: ${{ needs.get-version-number.outputs.VERSION }}
run: docker build ./windows-2019 --build-arg GOOGLE_CLOUD_CLI_VERSION=${env:GOOGLE_CLOUD_CLI_VERSION} --tag octopuslabs/gcp-workertools:${env:VERSION_NUMBER}-windows.2019 --tag octopuslabs/gcp-workertools:latest-windows.2019
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

- name: Push the win2019 version-specific image
env:
VERSION_NUMBER: ${{ needs.get-version-number.outputs.VERSION }}
run: docker push octopuslabs/gcp-workertools:${env:VERSION_NUMBER}-windows.2019
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

- name: Push the win2019 latest image
run: docker push octopuslabs/gcp-workertools:latest-windows.2019
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

build-win-2022:
needs: [get-version-number]
runs-on: windows-2022
Expand Down Expand Up @@ -201,7 +164,7 @@ jobs:
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

build-docker-manifest:
needs: [get-version-number, build-ubuntu, build-win-2019, build-win-2022]
needs: [get-version-number, build-ubuntu, build-win-2022]
runs-on: ubuntu-latest

steps:
Expand All @@ -213,15 +176,13 @@ jobs:
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

- name: Create docker manifest for latest tag
run: docker manifest create octopuslabs/gcp-workertools:latest octopuslabs/gcp-workertools:latest-windows.2019 octopuslabs/gcp-workertools:latest-windows.2022 octopuslabs/gcp-workertools:latest-ubuntu.2204
run: docker manifest create octopuslabs/gcp-workertools:latest octopuslabs/gcp-workertools:latest-windows.2022 octopuslabs/gcp-workertools:latest-ubuntu.2204
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

- name: Annotate docker manifest for latest tag
env:
WIN2019_VERSION: ${{ needs.get-version-number.outputs.WIN2019_VERSION }}
WIN2022_VERSION: ${{ needs.get-version-number.outputs.WIN2022_VERSION }}
run: |
docker manifest annotate --os "windows" --os-version "$WIN2019_VERSION" --arch "amd64" "octopuslabs/gcp-workertools:latest" "octopuslabs/gcp-workertools:latest-windows.2019" && \
docker manifest annotate --os "windows" --os-version "$WIN2022_VERSION" --arch "amd64" "octopuslabs/gcp-workertools:latest" "octopuslabs/gcp-workertools:latest-windows.2022"
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

Expand All @@ -232,16 +193,14 @@ jobs:
- name: Create docker manifest for version-specific tag
env:
VERSION_NUMBER: ${{ needs.get-version-number.outputs.VERSION }}
run: docker manifest create octopuslabs/gcp-workertools:$VERSION_NUMBER octopuslabs/gcp-workertools:$VERSION_NUMBER-windows.2019 octopuslabs/gcp-workertools:$VERSION_NUMBER-windows.2022 octopuslabs/gcp-workertools:$VERSION_NUMBER-ubuntu.2204
run: docker manifest create octopuslabs/gcp-workertools:$VERSION_NUMBER octopuslabs/gcp-workertools:$VERSION_NUMBER-windows.2022 octopuslabs/gcp-workertools:$VERSION_NUMBER-ubuntu.2204
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

- name: Annotate docker manifest for version-specific tag
env:
VERSION_NUMBER: ${{ needs.get-version-number.outputs.VERSION }}
WIN2019_VERSION: ${{ needs.get-version-number.outputs.WIN2019_VERSION }}
WIN2022_VERSION: ${{ needs.get-version-number.outputs.WIN2022_VERSION }}
run: |
docker manifest annotate --os "windows" --os-version "$WIN2019_VERSION" --arch "amd64" "octopuslabs/gcp-workertools:$VERSION_NUMBER" "octopuslabs/gcp-workertools:$VERSION_NUMBER-windows.2019" && \
docker manifest annotate --os "windows" --os-version "$WIN2022_VERSION" --arch "amd64" "octopuslabs/gcp-workertools:$VERSION_NUMBER" "octopuslabs/gcp-workertools:$VERSION_NUMBER-windows.2022"
if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ The following images are built in this repo:
- Ubuntu 22.04
- Ubuntu 20.04
- Windows 2022
- Windows 2019

A new image will be built each time a new version of the GCloud CLI is released. The version numbers will be based on the version of the GCloud CLI.

Expand Down
28 changes: 0 additions & 28 deletions windows-2019/Dockerfile

This file was deleted.

0 comments on commit 5d8621b

Please sign in to comment.