@spinnaker/docker 2026.2.2 → 2026.3.0

package/src/pipeline/trigger/DockerTriggerTemplate.tsx

@@ -1,5 +1,4 @@
 import { get } from 'lodash';
-import { $q } from 'ngimport';
 import React from 'react';
 import type { Option } from 'react-select';
 import type { Subscription } from 'rxjs';
@@ -33,9 +32,12 @@ export class DockerTriggerTemplate extends React.Component<
 > {
   private queryStream = new Subject();
   private subscription: Subscription;
+  private tagRequest: AbortController;
 
-  public static formatLabel(trigger: IDockerTrigger): PromiseLike<string> {
-    return $q.when(`(Docker Registry) ${trigger.account ? trigger.account + ':' : ''} ${trigger.repository || ''}`);
+  public static formatLabel(trigger: IDockerTrigger): Promise<string> {
+    return Promise.resolve(
+      `(Docker Registry) ${trigger.account ? trigger.account + ':' : ''} ${trigger.repository || ''}`,
+    );
   }
 
   public constructor(props: ITriggerTemplateComponentProps) {
@@ -51,22 +53,30 @@ export class DockerTriggerTemplate extends React.Component<
   }
 
   private handleQuery = () => {
+    this.tagRequest?.abort();
+    this.tagRequest = new AbortController();
     const trigger = this.props.command.trigger as IDockerTrigger;
     if (trigger.type === 'helm/oci') {
       return observableFrom(
-        DockerChartImageReader.findTags({
-          provider: 'dockerRegistry', // Use helmOci provider for Helm OCI triggers
-          account: trigger.account,
-          repository: trigger.repository,
-        }),
+        DockerChartImageReader.findTags(
+          {
+            provider: 'dockerRegistry', // Use helmOci provider for Helm OCI triggers
+            account: trigger.account,
+            repository: trigger.repository,
+          },
+          this.tagRequest.signal,
+        ),
       );
     } else {
       return observableFrom(
-        DockerImageReader.findTags({
-          provider: 'dockerRegistry',
-          account: trigger.account,
-          repository: trigger.repository,
-        }),
+        DockerImageReader.findTags(
+          {
+            provider: 'dockerRegistry',
+            account: trigger.account,
+            repository: trigger.repository,
+          },
+          this.tagRequest.signal,
+        ),
       );
     }
   };
@@ -153,6 +163,7 @@ export class DockerTriggerTemplate extends React.Component<
     if (this.subscription) {
       this.subscription.unsubscribe();
     }
+    this.tagRequest?.abort();
 
     // cancel search stream if trigger has changed to some other type
     if (command.trigger.type !== 'docker' && command.trigger.type !== 'helm/oci') {
@@ -174,6 +185,7 @@ export class DockerTriggerTemplate extends React.Component<
     if (this.subscription) {
       this.subscription.unsubscribe();
     }
+    this.tagRequest?.abort();
   }
 
   private searchTags = (query = '') => {

package/dist/pipeline/stages/bake/bakeExecutionDetails.controller.d.ts

@@ -1,2 +0,0 @@
-export const DOCKER_PIPELINE_STAGES_BAKE_BAKEEXECUTIONDETAILS_CONTROLLER: "spinnaker.docker.pipeline.stage.bake.executionDetails.controller";
-export const name: "spinnaker.docker.pipeline.stage.bake.executionDetails.controller";

package/src/pipeline/stages/bake/bakeExecutionDetails.controller.js

@@ -1,36 +0,0 @@
-'use strict';
-
-import UIROUTER_ANGULARJS from '@uirouter/angularjs';
-import { module } from 'angular';
-
-import { SETTINGS } from '@spinnaker/core';
-
-export const DOCKER_PIPELINE_STAGES_BAKE_BAKEEXECUTIONDETAILS_CONTROLLER =
-  'spinnaker.docker.pipeline.stage.bake.executionDetails.controller';
-export const name = DOCKER_PIPELINE_STAGES_BAKE_BAKEEXECUTIONDETAILS_CONTROLLER; // for backwards compatibility
-module(DOCKER_PIPELINE_STAGES_BAKE_BAKEEXECUTIONDETAILS_CONTROLLER, [UIROUTER_ANGULARJS]).controller(
-  'dockerBakeExecutionDetailsCtrl',
-  [
-    '$scope',
-    '$stateParams',
-    'executionDetailsSectionService',
-    '$interpolate',
-    function ($scope, $stateParams, executionDetailsSectionService, $interpolate) {
-      $scope.configSections = ['bakeConfig', 'taskStatus'];
-
-      const initialized = () => {
-        $scope.detailsSection = $stateParams.details;
-        $scope.provider = $scope.stage.context.cloudProviderType || 'docker';
-        $scope.bakeryDetailUrl = $interpolate(
-          $scope.roscoMode && SETTINGS.roscoDetailUrl ? SETTINGS.roscoDetailUrl : SETTINGS.bakeryDetailUrl,
-        );
-      };
-
-      const initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized);
-
-      initialize();
-
-      $scope.$on('$stateChangeSuccess', initialize);
-    },
-  ],
-);

package/src/pipeline/stages/bake/bakeExecutionDetails.html

@@ -1,47 +0,0 @@
-<div ng-controller="dockerBakeExecutionDetailsCtrl">
-  <execution-details-section-nav sections="configSections"></execution-details-section-nav>
-  <div class="step-section-details" ng-if="detailsSection === 'bakeConfig'">
-    <div class="row">
-      <div class="col-md-6">
-        <dl class="dl-narrow dl-horizontal">
-          <dt if-multiple-providers>Provider</dt>
-          <dd if-multiple-providers>Docker</dd>
-          <dt>Organization</dt>
-          <dd>{{stage.context.organization}}</dd>
-          <dt>Image Name</dt>
-          <dd>{{stage.context.ami_name}}</dd>
-          <dt>Image Tag</dt>
-          <dd>{{stage.context.extendedAttributes['docker_target_image_tag']}}</dd>
-          <dt>Image</dt>
-          <dd>{{stage.context.ami}}</dd>
-        </dl>
-      </div>
-      <div class="col-md-6">
-        <dl class="dl-narrow dl-horizontal">
-          <dt>Base OS</dt>
-          <dd>{{stage.context.baseOs}}</dd>
-          <dt>Region</dt>
-          <dd>{{stage.context.region}}</dd>
-          <dt>Package</dt>
-          <dd>{{stage.context.package}}</dd>
-          <dt>Label</dt>
-          <dd>{{stage.context.baseLabel}}</dd>
-        </dl>
-      </div>
-    </div>
-    <stage-failure-message stage="stage" message="stage.failureMessage"></stage-failure-message>
-
-    <div class="row" ng-if="stage.context.region && stage.context.status.resourceId">
-      <div class="col-md-12">
-        <div class="alert alert-{{stage.isFailed ? 'danger' : 'info'}}">
-          <a target="_blank" href="{{ bakeryDetailUrl(stage) }}"> View Bakery Details </a>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="step-section-details" ng-if="detailsSection === 'taskStatus'">
-    <div class="row">
-      <execution-step-details item="stage"></execution-step-details>
-    </div>
-  </div>
-</div>

package/src/pipeline/stages/bake/bakeStage.html

@@ -1,32 +0,0 @@
-<div ng-controller="dockerBakeStageCtrl as bakeStageCtrl">
-  <stage-config-field label="Package" help-key="pipeline.config.bake.package">
-    <input type="text" class="form-control input-sm" ng-model="stage.package" />
-  </stage-config-field>
-  <stage-config-field label="Organization" help-key="pipeline.config.docker.bake.organization">
-    <input type="text" class="form-control input-sm" ng-model="stage.organization" />
-  </stage-config-field>
-  <stage-config-field label="Image Name" help-key="pipeline.config.docker.bake.targetImage">
-    <input type="text" class="form-control input-sm" ng-model="stage.ami_name" />
-  </stage-config-field>
-  <stage-config-field label="Image tag" help-key="pipeline.config.docker.bake.targetImageTag">
-    <input type="text" class="form-control input-sm" ng-model="stage.extendedAttributes['docker_target_image_tag']" />
-  </stage-config-field>
-  <stage-config-field label="Base OS">
-    <bake-stage-choose-os model="stage.baseOs" base-os-options="baseOsOptions"></bake-stage-choose-os>
-  </stage-config-field>
-
-  <stage-config-field label="Base Label">
-    <label class="radio-inline" ng-repeat="baseLabel in baseLabelOptions">
-      <input type="radio" ng-model="stage.baseLabel" ng-value="baseLabel" />
-      {{baseLabel}}
-    </label>
-  </stage-config-field>
-  <stage-config-field label="Rebake">
-    <div class="checkbox" style="margin-bottom: 0">
-      <label>
-        <input type="checkbox" ng-model="stage.rebake" />
-        Rebake image without regard to the status of any existing bake
-      </label>
-    </div>
-  </stage-config-field>
-</div>

package/src/pipeline/stages/bake/dockerBakeStage.js

@@ -1,81 +0,0 @@
-'use strict';
-
-import { module } from 'angular';
-import _ from 'lodash';
-
-import { AuthenticationService, BakeExecutionLabel, BakeryReader, Registry } from '@spinnaker/core';
-import { DOCKER_PIPELINE_STAGES_BAKE_BAKEEXECUTIONDETAILS_CONTROLLER } from './bakeExecutionDetails.controller';
-
-/*
-  This stage is just here so that we can experiment with baking Docker containers within pipelines.
-  Without this stage, programmatically-created pipelines with Docker bake stages would not render
-  execution details.
- */
-export const DOCKER_PIPELINE_STAGES_BAKE_DOCKERBAKESTAGE = 'spinnaker.docker.pipeline.stage.bakeStage';
-export const name = DOCKER_PIPELINE_STAGES_BAKE_DOCKERBAKESTAGE; // for backwards compatibility
-module(DOCKER_PIPELINE_STAGES_BAKE_DOCKERBAKESTAGE, [DOCKER_PIPELINE_STAGES_BAKE_BAKEEXECUTIONDETAILS_CONTROLLER])
-  .config(function () {
-    Registry.pipeline.registerStage({
-      provides: 'bake',
-      cloudProvider: 'docker',
-      label: 'Bake',
-      description: 'Bakes an image',
-      templateUrl: require('./bakeStage.html'),
-      executionDetailsUrl: require('./bakeExecutionDetails.html'),
-      executionLabelComponent: BakeExecutionLabel,
-      extraLabelLines: (stage) => {
-        return stage.masterStage.context.allPreviouslyBaked || stage.masterStage.context.somePreviouslyBaked ? 1 : 0;
-      },
-      supportsCustomTimeout: true,
-      validators: [{ type: 'requiredField', fieldName: 'package' }],
-      restartable: true,
-    });
-  })
-  .controller('dockerBakeStageCtrl', [
-    '$scope',
-    '$q',
-    function ($scope, $q) {
-      const stage = $scope.stage;
-
-      stage.region = 'global';
-
-      if (!$scope.stage.user) {
-        $scope.stage.user = AuthenticationService.getAuthenticatedUser().name;
-      }
-
-      $scope.viewState = {
-        loading: true,
-      };
-
-      function initialize() {
-        $scope.viewState.providerSelected = true;
-        $q.all([BakeryReader.getBaseOsOptions('docker'), BakeryReader.getBaseLabelOptions()]).then(function ([
-          baseOsOptions,
-          baseLabelOptions,
-        ]) {
-          $scope.baseOsOptions = baseOsOptions.baseImages;
-          $scope.baseLabelOptions = baseLabelOptions;
-
-          if (!$scope.stage.baseOs && $scope.baseOsOptions && $scope.baseOsOptions.length) {
-            $scope.stage.baseOs = $scope.baseOsOptions[0].id;
-          }
-          if (!$scope.stage.baseLabel && $scope.baseLabelOptions && $scope.baseLabelOptions.length) {
-            $scope.stage.baseLabel = $scope.baseLabelOptions[0];
-          }
-          $scope.viewState.loading = false;
-        });
-      }
-
-      function deleteEmptyProperties() {
-        _.forOwn($scope.stage, function (val, key) {
-          if (val === '') {
-            delete $scope.stage[key];
-          }
-        });
-      }
-
-      $scope.$watch('stage', deleteEmptyProperties, true);
-
-      initialize();
-    },
-  ]);