Skip to content

Commit 5938f87

Browse files
committed
Revert "Improved pipelines by using cached tool installers"
This reverts commit 8bf9855.
1 parent 8bf9855 commit 5938f87

File tree

4 files changed

+29
-71
lines changed

4 files changed

+29
-71
lines changed

.devops/pipelines/jobs.ci.build.docker.yaml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,38 @@ jobs:
2222
- ${{ if eq(parameters.arch, 'arm64') }}:
2323
- Agent.OSArchitecture -equals ARM64
2424
variables:
25+
- ${{ if eq(parameters.arch, 'amd64') }}:
26+
- name: Docker.CLI.Architecture
27+
value: amd64
28+
- ${{ if eq(parameters.arch, 'arm64') }}:
29+
- name: Docker.CLI.Architecture
30+
value: arm64
31+
- ${{ if eq(parameters.arch, 'arm') }}:
32+
- name: Docker.CLI.Architecture
33+
value: armhf
2534
- name: Docker.Image.Architecture
2635
value: ${{ parameters.arch }}
2736

2837
steps:
29-
- task: DockerInstaller@0
30-
displayName: 'Docker install'
31-
inputs:
32-
dockerVersion: '19.03.5'
38+
- script: |
39+
docker version
40+
if [ "$?" -ne "0" ]; then
41+
apt-get update
42+
apt-get install \
43+
apt-transport-https \
44+
ca-certificates \
45+
curl \
46+
gnupg2 \
47+
software-properties-common
48+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
49+
add-apt-repository \
50+
"deb [arch=$(Docker.CLI.Architecture)] https://download.docker.com/linux/ubuntu \
51+
$(lsb_release -cs) \
52+
stable"
53+
apt-get update
54+
apt-get install docker-ce docker-ce-cli containerd.io
55+
fi
56+
displayName: "Docker install"
3357
3458
- task: Docker@2
3559
displayName: 'Build image'

.devops/pipelines/stage.ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ stages:
1717
displayName: 'Create Artifacts directories'
1818
- task: HelmInstaller@1
1919
inputs:
20-
helmVersionToInstall: '3.2.4'
20+
helmVersionToInstall: '3.1.1'
2121
displayName: "Helm install"
2222
- script: |
2323
cp README.md src/deploy/helm/sftp/README.md

.github/dependabot.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,3 @@ updates:
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 10
8-
- package-ecosystem: docker
9-
directory: "/src/ES.SFTP.Host"
10-
schedule:
11-
interval: daily
12-
open-pull-requests-limit: 10

.github/stale.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)