diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7a34328969..ae8f76d1ae 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,16 +5,12 @@ on: workflow_dispatch: inputs: image_version: - description: "Docker image version" + description: "Image version" required: true staging: description: "Build staging images" type: boolean default: false - prepull_staging: - description: "Pre-pull staging Docker images" - type: boolean - default: false build_docker: description: "Build Docker images" type: boolean @@ -39,7 +35,6 @@ on: env: PACKER_VERSION: "1.9.2" BUILD_DOCKER_REPO: ${{ inputs.staging && 'base-stgn' || 'base' }} - PREPULL_DOCKER_REPO: ${{ inputs.prepull_staging && 'base-stgn' || 'base' }} VM_IMAGE_BUILD_PREFIX: ${{ inputs.staging && format('stgn-{0}-', github.run_number) || '' }} # staging ? prefix : '' jobs: @@ -111,7 +106,7 @@ jobs: chmod +x packer - name: Run packer run: | - ./packer build -var-file=versions.json $PROD_VARS -var image_repo=${{ env.PREPULL_DOCKER_REPO }} -var image_version=${{ inputs.image_version }} -var build_prefix=$VM_IMAGE_BUILD_PREFIX aws-image${{ matrix.variant }}.json + ./packer build -var-file=versions.json $PROD_VARS -var image_version=${{ inputs.image_version }} -var build_prefix=$VM_IMAGE_BUILD_PREFIX aws-image${{ matrix.variant }}.json env: PROD_VARS: ${{ !inputs.staging && '-var-file=aws-vars-prod.json' || '' }} # production ? var-file : '' @@ -144,7 +139,7 @@ jobs: chmod +x packer - name: Run packer run: | - ./packer build -var-file=versions.json -var image_repo=${{ env.PREPULL_DOCKER_REPO }} -var image_version=${{ inputs.image_version }} -var build_prefix=$VM_IMAGE_BUILD_PREFIX azure-image${{ matrix.variant }}.json + ./packer build -var-file=versions.json -var image_version=${{ inputs.image_version }} -var build_prefix=$VM_IMAGE_BUILD_PREFIX azure-image${{ matrix.variant }}.json - name: Publish azure image if: ${{ !inputs.staging }} run: | @@ -182,7 +177,7 @@ jobs: chmod +x packer - name: Run packer run: | - ./packer build -var-file=versions.json -var image_repo=${{ env.PREPULL_DOCKER_REPO }} -var image_version=${{ inputs.image_version }} -var build_prefix=$VM_IMAGE_BUILD_PREFIX gcp-image${{ matrix.variant }}.json + ./packer build -var-file=versions.json -var image_version=${{ inputs.image_version }} -var build_prefix=$VM_IMAGE_BUILD_PREFIX gcp-image${{ matrix.variant }}.json - name: Publish images run: | IMAGE_VERSION=${IMAGE_VERSION//./-} @@ -231,7 +226,6 @@ jobs: run: | ./packer build \ -var-file=versions.json \ - -var image_repo=${{ env.PREPULL_DOCKER_REPO }} \ -var image_version=${{ inputs.image_version }} \ -var build_prefix=$VM_IMAGE_BUILD_PREFIX \ -var oci_compartment_ocid=$OCI_COMPARTMENT \ diff --git a/scripts/packer/aws-image-cuda.json b/scripts/packer/aws-image-cuda.json index 9074dcdbd5..c60ee6d325 100644 --- a/scripts/packer/aws-image-cuda.json +++ b/scripts/packer/aws-image-cuda.json @@ -12,7 +12,6 @@ "build_prefix": "", "ami_regions": "", "ami_groups": "", - "image_repo": "", "image_version": "" }, "builders": [ diff --git a/scripts/packer/aws-image.json b/scripts/packer/aws-image.json index 45d41b5a85..ab6922e9fb 100644 --- a/scripts/packer/aws-image.json +++ b/scripts/packer/aws-image.json @@ -11,7 +11,6 @@ "build_prefix": "", "ami_regions": "", "ami_groups": "", - "image_repo": "", "image_version": "" }, "builders": [ diff --git a/scripts/packer/azure-image-cuda.json b/scripts/packer/azure-image-cuda.json index 9f1e82ae80..0a200e7855 100644 --- a/scripts/packer/azure-image-cuda.json +++ b/scripts/packer/azure-image-cuda.json @@ -10,7 +10,6 @@ "build_prefix": "", "docker_version": "", "cuda_drivers_version": "", - "image_repo": "", "image_version": "" }, "builders": [{ diff --git a/scripts/packer/azure-image-grid.json b/scripts/packer/azure-image-grid.json index 863bfc7693..bad64a24aa 100644 --- a/scripts/packer/azure-image-grid.json +++ b/scripts/packer/azure-image-grid.json @@ -9,7 +9,6 @@ "azure_vm_size": "Standard_D2s_v6", "build_prefix": "", "docker_version": "", - "image_repo": "", "image_version": "" }, "builders": [{ diff --git a/scripts/packer/azure-image.json b/scripts/packer/azure-image.json index bb630166a9..7d7d0d9c82 100644 --- a/scripts/packer/azure-image.json +++ b/scripts/packer/azure-image.json @@ -9,7 +9,6 @@ "azure_vm_size": "Standard_D2s_v6", "build_prefix": "", "docker_version": "", - "image_repo": "", "image_version": "" }, "builders": [{ diff --git a/scripts/packer/gcp-image-cuda.json b/scripts/packer/gcp-image-cuda.json index b093d35007..6f68d6e277 100644 --- a/scripts/packer/gcp-image-cuda.json +++ b/scripts/packer/gcp-image-cuda.json @@ -3,7 +3,6 @@ "build_prefix": "", "docker_version": "", "cuda_drivers_version": "", - "image_repo": "", "image_version": "" }, "builders": [ diff --git a/scripts/packer/gcp-image.json b/scripts/packer/gcp-image.json index 853b1bbd6b..b500a78989 100644 --- a/scripts/packer/gcp-image.json +++ b/scripts/packer/gcp-image.json @@ -2,7 +2,6 @@ "variables": { "build_prefix": "", "docker_version": "", - "image_repo": "", "image_version": "" }, "builders": [ diff --git a/scripts/packer/oci-image-cuda.json b/scripts/packer/oci-image-cuda.json index 6b096a2341..df2d69af9f 100644 --- a/scripts/packer/oci-image-cuda.json +++ b/scripts/packer/oci-image-cuda.json @@ -3,7 +3,6 @@ "build_prefix": "", "docker_version": "", "cuda_drivers_version": "", - "image_repo": "", "image_version": "", "oci_availability_domain": "", "oci_compartment_ocid": "", diff --git a/scripts/packer/oci-image.json b/scripts/packer/oci-image.json index 9fc1d04aa8..c80626723f 100644 --- a/scripts/packer/oci-image.json +++ b/scripts/packer/oci-image.json @@ -2,7 +2,6 @@ "variables": { "build_prefix": "", "docker_version": "", - "image_repo": "", "image_version": "", "oci_availability_domain": "", "oci_compartment_ocid": "",