Skip to content

{Docker} Rename local docker image tag #15463

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
fengzhou-msft merged 1 commit into from
Oct 13, 2020
Merged

{Docker} Rename local docker image tag #15463

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
6 changes: 0 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:<version>
```

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
```
Comment on lines -125 to -129
Copy link
Member Author

@fengzhou-msft fengzhou-msft Oct 9, 2020

Choose a reason for hiding this comment

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

This image has not been updated for over 2 years. This is no longer in the pipeline.


### Edge builds

If you want to get the latest build from the `dev` branch, you can use our "edge" builds.
Expand Down
6 changes: 3 additions & 3 deletions scripts/release/debian/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions scripts/release/rpm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions scripts/release/rpm/pipeline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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