Skip to content

Update docker files to use MCR #7656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 1 commit into from
Aug 30, 2018
Merged

Update docker files to use MCR #7656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Docker image file that describes an Centos7 image with PowerShell installed from Microsoft YUM Repo

FROM microsoft/powershell:centos7
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
FROM mcr.microsoft.com/powershell:centos7
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"

# Install dependencies and clean up
RUN yum install -y \
Expand Down
6 changes: 3 additions & 3 deletions tools/releaseBuild/Images/microsoft_powershell_ubuntu14.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Docker image file that describes an Ubuntu14.04 image with PowerShell installed from Microsoft APT Repo

FROM microsoft/powershell:ubuntu14.04
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
FROM mcr.microsoft.com/powershell:ubuntu14.04
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"

# Install dependencies and clean up
RUN apt-get update \
Expand All @@ -27,7 +27,7 @@ RUN apt-get update \
dpkg-dev \
libfuse-dev \
fuse \
python \
python \
&& rm -rf /var/lib/apt/lists/*

COPY PowerShellPackage.ps1 /
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo

FROM microsoft/powershell:ubuntu16.04
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
FROM mcr.microsoft.com/powershell:ubuntu16.04
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"

# Install dependencies and clean up
RUN apt-get update \
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# escape=`
#0.3.6 (no powershell 6)
FROM microsoft/powershell:windowsservercore
FROM mcr.microsoft.com/powershell:windowsservercore
Copy link

@anmenaga anmenaga Aug 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed servercore dockerfile wasn't updated in the last PR (and it is using strange FROM location). Just FYI.

Copy link
Member Author

@adityapatwardhan adityapatwardhan Aug 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is just a sample in PSRelease repo.

LABEL maintainer='PowerShell Team <powershellteam@hotmail.com>'
LABEL description="This Dockerfile for Windows Server Core with git installed via chocolatey."

Expand All @@ -15,7 +15,7 @@ RUN Import-Module ./containerFiles/dockerInstall.psm1; `

# Install WIX
ADD https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip /wix.zip
COPY wix.psm1 containerFiles/wix.psm1
COPY wix.psm1 containerFiles/wix.psm1
RUN Import-Module ./containerFiles/wix.psm1; `
Install-WixZip -zipPath \wix.Zip

Expand Down