admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update docker files to use MCR (#7656)

Browse Source
This commit is contained in:
Aditya Patwardhan
2018-08-31 16:55:42 -07:00
committed by Travis Plunk
parent 727f2a07b8
commit aa6911d2d1
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile
+2 -2
View File
@@ -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 \
tools/releaseBuild/Images/microsoft_powershell_ubuntu14.04/Dockerfile
+3 -3
View File
@@ -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 \
@@ -27,7 +27,7 @@ RUN apt-get update \
dpkg-dev \
libfuse-dev \
fuse \
python \
python \
&& rm -rf /var/lib/apt/lists/*
COPY PowerShellPackage.ps1 /
tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile
+2 -2
View File
@@ -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 \
tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile
+2 -2
View File
@@ -1,6 +1,6 @@
# escape=`
#0.3.6 (no powershell 6)
FROM microsoft/powershell:windowsservercore
FROM mcr.microsoft.com/powershell:windowsservercore
LABEL maintainer='PowerShell Team <powershellteam@hotmail.com>'
LABEL description="This Dockerfile for Windows Server Core with git installed via chocolatey."
@@ -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