diff --git a/README.md b/README.md index e9af614cd30..b1042f89834 100644 --- a/README.md +++ b/README.md @@ -122,12 +122,6 @@ See our [Docker tags](https://mcr.microsoft.com/v2/azure-cli/tags/list) for avai $ docker run -u $(id -u):$(id -g) -v ${HOME}:/home/az -e HOME=/home/az --rm -it mcr.microsoft.com/azure-cli: ``` -For automated builds triggered by pushes to this repo, see [azuresdk/azure-cli-python](https://hub.docker.com/r/azuresdk/azure-cli-python/tags). -For example: -```bash -$ docker run -u $(id -u):$(id -g) -v ${HOME}:/home/az -e HOME=/home/az --rm -it azuresdk/azure-cli-python:dev -``` - ### Edge builds If you want to get the latest build from the `dev` branch, you can use our "edge" builds. diff --git a/scripts/release/debian/README.md b/scripts/release/debian/README.md index c2564861311..67c2a01893b 100644 --- a/scripts/release/debian/README.md +++ b/scripts/release/debian/README.md @@ -7,15 +7,15 @@ Building the Debian package On a machine with Docker, execute the following command from the root directory of this repository: ``` bash -docker build --target build-env -f ./scripts/release/debian/Dockerfile -t microsoft/azure-cli:ubuntu-builder . +docker build --target build-env -f ./scripts/release/debian/Dockerfile -t azure/azure-cli:ubuntu-builder . ``` -After several minutes, this will have created a Docker image named `microsoft/azure-cli:ubuntu-builder` containing an +After several minutes, this will have created a Docker image named `azure/azure-cli:ubuntu-builder` containing an unsigned `.deb` built from the current contents of your azure-cli directory. To extract the build product from the image you can run the following command: ``` bash -docker run microsoft/azure-cli:ubuntu-builder cat /azure-cli/debian/ +docker run azure/azure-cli:ubuntu-builder cat /azure-cli/debian/ ``` The script only runs in container environment. diff --git a/scripts/release/rpm/README.md b/scripts/release/rpm/README.md index 67b449ff65d..8fd544a3709 100644 --- a/scripts/release/rpm/README.md +++ b/scripts/release/rpm/README.md @@ -6,26 +6,26 @@ On a machine with Docker, execute the following command from the root directory _Enterprise Linux:_ ``` bash -docker build --target build-env -f ./scripts/release/rpm/Dockerfile.centos -t mcr.microsoft.com/azure-cli:centos7-builder . +docker build --target build-env -f ./scripts/release/rpm/Dockerfile.centos -t azure/azure-cli:centos7-builder . ``` _Fedora:_ ```bash -docker build --target build-env -f ./scripts/release/rpm/Dockerfile.fedora -t mcr.microsoft.com/azure-cli:fedora29-builder . +docker build --target build-env -f ./scripts/release/rpm/Dockerfile.fedora -t azure/azure-cli:fedora29-builder . ``` -After several minutes, this will have created a Docker image named `microsoft/azure-cli:centos7-builder` containing an +After several minutes, this will have created a Docker image named `azure/azure-cli:centos7-builder` containing an unsigned `.rpm` built from the current contents of your azure-cli directory. To extract the build product from the image you can run the following command: _Enterprise Linux:_ ``` bash -docker run mcr.microsoft.com/azure-cli:centos7-builder cat /root/rpmbuild/RPMS/x86_64/azure-cli-dev-1.el7.x86_64.rpm > ./bin/azure-cli-dev-1.el7.x86_64.rpm +docker run azure/azure-cli:centos7-builder cat /root/rpmbuild/RPMS/x86_64/azure-cli-dev-1.el7.x86_64.rpm > ./bin/azure-cli-dev-1.el7.x86_64.rpm ``` _Fedora:_ ``` bash -docker run mcr.microsoft.com/azure-cli:fedora29-builder cat /root/rpmbuild/RPMS/x86_64/azure-cli-dev-1.fc29.x86_64.rpm > ./bin/azure-cli-dev-1.fc29.x86_64.rpm +docker run azure/azure-cli:fedora29-builder cat /root/rpmbuild/RPMS/x86_64/azure-cli-dev-1.fc29.x86_64.rpm > ./bin/azure-cli-dev-1.fc29.x86_64.rpm ``` This launches a container running from the image built and tagged by the previous command, prints the contents of the @@ -50,7 +50,7 @@ Run the RPM package On a machine with Docker, execute the following command from the root directory of this repository: ``` bash -docker build -f ./scripts/release/rpm/Dockerfile.centos -t mcr.microsoft.com/azure-cli:centos7 . +docker build -f ./scripts/release/rpm/Dockerfile.centos -t azure/azure-cli:centos7 . ``` If you had previously followed this instructions above for building an RPM package, this should finish very quickly. diff --git a/scripts/release/rpm/pipeline.sh b/scripts/release/rpm/pipeline.sh index df6958a1c8d..237335bcb16 100755 --- a/scripts/release/rpm/pipeline.sh +++ b/scripts/release/rpm/pipeline.sh @@ -13,19 +13,19 @@ docker build \ --target build-env \ --build-arg cli_version=${CLI_VERSION} \ -f ./scripts/release/rpm/Dockerfile.centos \ - -t microsoft/azure-cli:centos7-builder \ + -t azure/azure-cli:centos7-builder \ . # Continue the previous build, and create a container that has the current azure-cli build but not the source code. docker build \ --build-arg cli_version=${CLI_VERSION} \ -f ./scripts/release/rpm/Dockerfile.centos \ - -t microsoft/azure-cli:centos7 \ + -t azure/azure-cli:centos7 \ . # Extract the built RPM so that it can be distributed independently. docker run \ - microsoft/azure-cli:centos7-builder \ + azure/azure-cli:centos7-builder \ cat /root/rpmbuild/RPMS/x86_64/azure-cli-${CLI_VERSION}-1.el7.x86_64.rpm \ > ${BUILD_STAGINGDIRECTORY}/azure-cli-${CLI_VERSION}-1.el7.x86_64.rpm @@ -34,6 +34,6 @@ docker run \ # # The products of `docker save` can be rehydrated using `docker load`. mkdir -p ${BUILD_STAGINGDIRECTORY}/docker -docker save microsoft/azure-cli:centos7-builder | gzip > ${BUILD_STAGINGDIRECTORY}/docker/microsoft_azure-cli_centos7-builder.tar.gz & -docker save microsoft/azure-cli:centos7 | gzip > ${BUILD_STAGINGDIRECTORY}/docker/microsoft_azure-cli_centos7.tar.gz & +docker save azure/azure-cli:centos7-builder | gzip > ${BUILD_STAGINGDIRECTORY}/docker/azure_azure-cli_centos7-builder.tar.gz & +docker save azure/azure-cli:centos7 | gzip > ${BUILD_STAGINGDIRECTORY}/docker/azure_azure-cli_centos7.tar.gz & wait