Skip to content

Commit 97b027c

Browse files
RDILTravisEz13
RDIL
and
TravisEz13
authored
Add dockerlint (#407)
Co-Authored-By: Travis Plunk <travis.plunk@microsoft.com>
1 parent 5737363 commit 97b027c

File tree

32 files changed

+75
-45
lines changed

32 files changed

+75
-45
lines changed

‎.vsts-ci/phase.yml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
name: ''
3-
vmImage: 'ubuntu-16.04'
3+
vmImage: 'ubuntu-18.04'
44
continueonerror: false
55
ciParameter: '-CI'
66
useacr: 'false'
@@ -36,13 +36,32 @@ jobs:
3636
displayName: 'az login'
3737
condition: and( succeededOrFailed(), ne(variables['Channel'],''))
3838

39-
4039
- pwsh: |
4140
if ( '$env:CHANNEL' -eq '' ) { exit }
4241
Install-module pester -Scope CurrentUser -Force
4342
displayName: Install Pester
4443
condition: and( succeededOrFailed(), ne(variables['Channel'],''))
4544
45+
- task: UsePythonVersion@0
46+
inputs:
47+
versionSpec: '3.8'
48+
displayName: Setup Python engine
49+
condition: succeeded()
50+
51+
- bash: |
52+
git clone https://github.com/RDIL/dockerlint.git
53+
cd dockerlint
54+
git checkout 0.2.1
55+
make install-deps
56+
make
57+
cd ..
58+
displayName: Download dockerlint
59+
condition: succeeded()
60+
61+
- bash: python dockerlint/main.py -d release/${CHANNEL}/${IMAGENAME}/docker/Dockerfile -R
62+
displayName: Run dockerlint
63+
condition: succeeded()
64+
4665
- pwsh: |
4766
$extraParams = @{}
4867
if($env:ACR_NAME)
@@ -76,3 +95,14 @@ jobs:
7695
testResultsFiles: '**\test*.xml'
7796
testRunTitle: $(ImageName)
7897
mergeTestResults: true
98+
99+
- task: PublishTestResults@2
100+
condition: and( succeededOrFailed(), ne(variables['Channel'],''))
101+
displayName: Publish $(ImageName) dockerlint Results
102+
continueOnError: ${{ variables.continueonerror }}
103+
104+
inputs:
105+
testRunner: JUnit
106+
testResultsFiles: 'dockerlint.test_RESULTS.xml'
107+
testRunTitle: $(ImageName) dockerlint
108+
mergeTestResults: true

‎release/lts/debian10/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4545

4646
# Install dependencies and clean up
4747
RUN apt-get update \
48-
&& apt-get install -y \
48+
&& apt-get install --no-install-recommends -y \
4949
# less is required for help in powershell
5050
less \
5151
# requied to setup the locale

‎release/lts/debian10/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/lts/debian11/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4545

4646
# Install dependencies and clean up
4747
RUN apt-get update \
48-
&& apt-get install -y \
48+
&& apt-get install --no-install-recommends -y \
4949
# less is required for help in powershell
5050
less \
5151
# requied to setup the locale

‎release/lts/debian11/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/lts/debian9/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
1818

1919
# Install dependencies and clean up
2020
RUN apt-get update \
21-
&& apt-get install -y \
21+
&& apt-get install --no-install-recommends -y \
2222
# curl is required to grab the Linux package
2323
curl \
2424
# less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
3131
# Download the Linux package and save it
3232
&& echo ${PS_PACKAGE_URL} \
3333
&& curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
34-
&& apt-get install -y /tmp/powershell.deb \
34+
&& apt-get install --no-install-recommends -y /tmp/powershell.deb \
3535
&& apt-get dist-upgrade -y \
3636
&& apt-get clean \
3737
&& rm -rf /var/lib/apt/lists/* \

‎release/lts/ubuntu16.04/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
1818

1919
# Install dependencies and clean up
2020
RUN apt-get update \
21-
&& apt-get install -y \
21+
&& apt-get install --no-install-recommends -y \
2222
# curl is required to grab the Linux package
2323
curl \
2424
# less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
3131
# Download the Linux package and save it
3232
&& echo ${PS_PACKAGE_URL} \
3333
&& curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
34-
&& apt-get install -y /tmp/powershell.deb \
34+
&& apt-get install --no-install-recommends -y /tmp/powershell.deb \
3535
&& apt-get dist-upgrade -y \
3636
&& apt-get clean \
3737
&& rm -rf /var/lib/apt/lists/* \

‎release/lts/ubuntu16.04/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/lts/ubuntu18.04/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
1818

1919
# Install dependencies and clean up
2020
RUN apt-get update \
21-
&& apt-get install -y \
21+
&& apt-get install --no-install-recommends -y \
2222
# curl is required to grab the Linux package
2323
curl \
2424
# less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
3131
# Download the Linux package and save it
3232
&& echo ${PS_PACKAGE_URL} \
3333
&& curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
34-
&& apt-get install -y /tmp/powershell.deb \
34+
&& apt-get install --no-install-recommends -y /tmp/powershell.deb \
3535
&& apt-get dist-upgrade -y \
3636
&& apt-get clean \
3737
&& rm -rf /var/lib/apt/lists/* \

‎release/lts/ubuntu18.04/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/preview/debian10/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4545

4646
# Install dependencies and clean up
4747
RUN apt-get update \
48-
&& apt-get install -y \
48+
&& apt-get install --no-install-recommends -y \
4949
# less is required for help in powershell
5050
less \
5151
# requied to setup the locale

‎release/preview/debian10/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/preview/debian11/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4545

4646
# Install dependencies and clean up
4747
RUN apt-get update \
48-
&& apt-get install -y \
48+
&& apt-get install --no-install-recommends -y \
4949
# less is required for help in powershell
5050
less \
5151
# requied to setup the locale

‎release/preview/debian11/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/preview/debian9/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
1818

1919
# Install dependencies and clean up
2020
RUN apt-get update \
21-
&& apt-get install -y \
21+
&& apt-get install --no-install-recommends -y \
2222
# curl is required to grab the Linux package
2323
curl \
2424
# less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
3131
# Download the Linux package and save it
3232
&& echo ${PS_PACKAGE_URL} \
3333
&& curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
34-
&& apt-get install -y /tmp/powershell.deb \
34+
&& apt-get install --no-install-recommends -y /tmp/powershell.deb \
3535
&& apt-get dist-upgrade -y \
3636
&& apt-get clean \
3737
&& rm -rf /var/lib/apt/lists/* \

‎release/preview/debian9/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/preview/ubuntu16.04/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
1818

1919
# Install dependencies and clean up
2020
RUN apt-get update \
21-
&& apt-get install -y \
21+
&& apt-get install --no-install-recommends -y \
2222
# curl is required to grab the Linux package
2323
curl \
2424
# less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
3131
# Download the Linux package and save it
3232
&& echo ${PS_PACKAGE_URL} \
3333
&& curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
34-
&& apt-get install -y /tmp/powershell.deb \
34+
&& apt-get install --no-install-recommends -y /tmp/powershell.deb \
3535
&& apt-get dist-upgrade -y \
3636
&& apt-get clean \
3737
&& rm -rf /var/lib/apt/lists/* \

‎release/preview/ubuntu16.04/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install -y --no-install-recommends \
99
sudo \
1010
curl \
1111
wget \

‎release/preview/ubuntu18.04/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
1818

1919
# Install dependencies and clean up
2020
RUN apt-get update \
21-
&& apt-get install -y \
21+
&& apt-get install --no-install-recommends -y \
2222
# curl is required to grab the Linux package
2323
curl \
2424
# less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
3131
# Download the Linux package and save it
3232
&& echo ${PS_PACKAGE_URL} \
3333
&& curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
34-
&& apt-get install -y /tmp/powershell.deb \
34+
&& apt-get install --no-install-recommends -y /tmp/powershell.deb \
3535
&& apt-get dist-upgrade -y \
3636
&& apt-get clean \
3737
&& rm -rf /var/lib/apt/lists/* \

‎release/preview/ubuntu18.04/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/stable/debian10/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4545

4646
# Install dependencies and clean up
4747
RUN apt-get update \
48-
&& apt-get install -y \
48+
&& apt-get install --no-install-recommends -y \
4949
# less is required for help in powershell
5050
less \
5151
# requied to setup the locale

‎release/stable/debian10/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/stable/debian11/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4545

4646
# Install dependencies and clean up
4747
RUN apt-get update \
48-
&& apt-get install -y \
48+
&& apt-get install --no-install-recommends -y \
4949
# less is required for help in powershell
5050
less \
5151
# requied to setup the locale

‎release/stable/debian11/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/stable/debian9/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
1717

1818
# Install dependencies and clean up
1919
RUN apt-get update \
20-
&& apt-get install -y \
20+
&& apt-get install --no-install-recommends -y \
2121
# curl is required to grab the Linux package
2222
curl \
2323
# less is required for help in powershell
@@ -30,7 +30,7 @@ RUN apt-get update \
3030
# Download the Linux package and save it
3131
&& echo ${PS_PACKAGE_URL} \
3232
&& curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
33-
&& apt-get install -y /tmp/powershell.deb \
33+
&& apt-get install --no-install-recommends -y /tmp/powershell.deb \
3434
&& apt-get dist-upgrade -y \
3535
&& apt-get clean \
3636
&& rm -rf /var/lib/apt/lists/* \

‎release/stable/debian9/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/stable/ubuntu16.04/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
1818

1919
# Install dependencies and clean up
2020
RUN apt-get update \
21-
&& apt-get install -y \
21+
&& apt-get install --no-install-recommends -y \
2222
# curl is required to grab the Linux package
2323
curl \
2424
# less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
3131
# Download the Linux package and save it
3232
&& echo ${PS_PACKAGE_URL} \
3333
&& curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
34-
&& apt-get install -y /tmp/powershell.deb \
34+
&& apt-get install --no-install-recommends -y /tmp/powershell.deb \
3535
&& apt-get dist-upgrade -y \
3636
&& apt-get clean \
3737
&& rm -rf /var/lib/apt/lists/* \

‎release/stable/ubuntu16.04/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

‎release/stable/ubuntu18.04/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
1818

1919
# Install dependencies and clean up
2020
RUN apt-get update \
21-
&& apt-get install -y \
21+
&& apt-get install --no-install-recommends -y \
2222
# curl is required to grab the Linux package
2323
curl \
2424
# less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
3131
# Download the Linux package and save it
3232
&& echo ${PS_PACKAGE_URL} \
3333
&& curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
34-
&& apt-get install -y /tmp/powershell.deb \
34+
&& apt-get install --no-install-recommends -y /tmp/powershell.deb \
3535
&& apt-get dist-upgrade -y \
3636
&& apt-get clean \
3737
&& rm -rf /var/lib/apt/lists/* \

‎release/stable/ubuntu18.04/test-deps/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ${BaseImage}
55

66
# Install dependencies and clean up
77
RUN apt-get update \
8-
&& apt-get install -y \
8+
&& apt-get install --no-install-recommends -y \
99
sudo \
1010
curl \
1111
wget \

0 commit comments

Comments
 (0)