Skip to content

Commit 91ccc10

Browse files
author
Aleks
committed
removing arm image
1 parent b67fc31 commit 91ccc10

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

.github/workflows/release.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,8 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- 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
2521
- name: Build and Publish All
2622
shell: pwsh
2723
run: |
2824
$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"

docker/Publish-UnpublishedImage.ps1

+1-6
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,7 @@ $moduleVersions | % {
4747
$imageVersion = "$moduleVersion-$baseImageSuffix";
4848
Write-Host "Checking $imageVersion"
4949
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;
5651
docker image tag $DOCKER_USERNAME/$DOCKER_IMAGE_NAME`:$imageVersion $DOCKER_USERNAME/$DOCKER_IMAGE_NAME`:latest;
5752
$plainStringPassword = [System.Net.NetworkCredential]::new("", $DOCKER_PASSWORD).Password;
5853
docker login -u $DOCKER_USERNAME -p "$plainStringPassword";

0 commit comments

Comments
 (0)