File tree 2 files changed +2
-11
lines changed
2 files changed +2
-11
lines changed Original file line number Diff line number Diff line change 18
18
runs-on : ubuntu-latest
19
19
steps :
20
20
- uses : actions/checkout@v2
21
- - name : Set up QEMU
22
- uses : docker/setup-qemu-action@v1
23
- - name : Set up Docker Buildx
24
- uses : docker/setup-buildx-action@v1
25
21
- name : Build and Publish All
26
22
shell : pwsh
27
23
run : |
28
24
$securedPassword = ConvertTo-SecureString "${{ secrets.DOCKER_PASSWORD }}" -AsPlainText -Force
29
- ./docker/Publish-UnpublishedImage.ps1 PnP.PowerShell ${{ secrets.DOCKER_USERNAME }} powershell $securedPassword "root" $false "alpine-3.14,arm32v7-ubuntu-bionic "
25
+ ./docker/Publish-UnpublishedImage.ps1 PnP.PowerShell ${{ secrets.DOCKER_USERNAME }} powershell $securedPassword "root" $false "alpine-3.14"
Original file line number Diff line number Diff line change @@ -47,12 +47,7 @@ $moduleVersions | % {
47
47
$imageVersion = " $moduleVersion -$baseImageSuffix " ;
48
48
Write-Host " Checking $imageVersion "
49
49
if ( ! ( $publishedImageVersions -contains $imageVersion ) ) {
50
- if ( $baseImageSuffix -eq " arm32v7-ubuntu-bionic" ) {
51
- Write-Host " Using buildx --platform linux/arm/v7" ;
52
- docker buildx build -- load -- platform linux/ arm/ v7 -- build-arg " PNP_MODULE_VERSION=$moduleVersion " -- build-arg " BASE_IMAGE_SUFFIX=$baseImageSuffix " -- build-arg " INSTALL_USER=$DOCKER_INSTALL_USER " -- build-arg " SKIP_PUBLISHER_CHECK=$SKIP_PUBLISHER_CHECK " ./ docker -f ./ docker/ pnppowershell.dockerFile -- tag $DOCKER_USERNAME / $DOCKER_IMAGE_NAME ` :$imageVersion ;
53
- } else {
54
- docker build -- build-arg " PNP_MODULE_VERSION=$moduleVersion " -- build-arg " BASE_IMAGE_SUFFIX=$baseImageSuffix " -- build-arg " INSTALL_USER=$DOCKER_INSTALL_USER " -- build-arg " SKIP_PUBLISHER_CHECK=$SKIP_PUBLISHER_CHECK " ./ docker -f ./ docker/ pnppowershell.dockerFile -- tag $DOCKER_USERNAME / $DOCKER_IMAGE_NAME ` :$imageVersion ;
55
- }
50
+ docker build -- build-arg " PNP_MODULE_VERSION=$moduleVersion " -- build-arg " BASE_IMAGE_SUFFIX=$baseImageSuffix " -- build-arg " INSTALL_USER=$DOCKER_INSTALL_USER " -- build-arg " SKIP_PUBLISHER_CHECK=$SKIP_PUBLISHER_CHECK " ./ docker -f ./ docker/ pnppowershell.dockerFile -- tag $DOCKER_USERNAME / $DOCKER_IMAGE_NAME ` :$imageVersion ;
56
51
docker image tag $DOCKER_USERNAME / $DOCKER_IMAGE_NAME ` :$imageVersion $DOCKER_USERNAME / $DOCKER_IMAGE_NAME ` :latest;
57
52
$plainStringPassword = [System.Net.NetworkCredential ]::new(" " , $DOCKER_PASSWORD ).Password;
58
53
docker login - u $DOCKER_USERNAME - p " $plainStringPassword " ;
You can’t perform that action at this time.
0 commit comments