Revert "containers: replace docker.io hub with quay.io hub"

The quay.io does not provides a way to disable the build cache[1],
switching back to docker.io which can.

[1]: https://issues.redhat.com/browse/PROJQUAY-474

This reverts commit 45dc9cf77b1a35b823742c258c8e51ef89603a5d.

Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2020-03-17 16:59:47 +08:00
parent 4d05b7ee88
commit 02d517c0d7
5 changed files with 52 additions and 23 deletions

View File

@ -4,8 +4,8 @@ It may be used both locally and through CI.
## Components
- Container specifications to be used for the tests are in the `packaging`
directory. The images are published on quay hub:
https://quay.io/organization/nmstate
directory. The images are published on docker hub:
https://hub.docker.com/r/nmstate/
- run-tests.sh: Execute the tests in a container using
'nmstate/fedora-nmstate-dev' container image.
@ -79,11 +79,11 @@ or:
To test the image, either specify it manually as described above or tag it locally:
```
podman tag local/centos8-nmstate-dev quay.io/nmstate/centos8-nmstate-dev:latest
podman tag local/fedora-nmstate-dev quay.io/nmstate/fedora-nmstate-dev:latest
podman tag local/centos8-nmstate-dev docker.io/nmstate/centos8-nmstate-dev:latest
podman tag local/fedora-nmstate-dev docker.io/nmstate/fedora-nmstate-dev:latest
```
### Push local image to the quay hub
### Push local image to the docker hub
The container images are automatically rebuilt for new commits to the master
branch or new tags. Therefore updates to the Docker Hub images should always
happen with a pull request that is merged to ensure that the change is
@ -91,14 +91,14 @@ persistent. If this is not feasible, a new build could be pushed as follow to
the Docker Hub:
```shell
podman login quay.io
podman login docker.io
podman tag local/centos8-nmstate-dev nmstate/centos8-nmstate-dev:latest
podman push nmstate/centos8-nmstate-dev:latest \
quay://quay.io/nmstate/centos8-nmstate-dev:latest
docker://docker.io/nmstate/centos8-nmstate-dev:latest
podman tag local/fedora-nmstate-dev nmstate/fedora-nmstate-dev:latest
podman push nmstate/fedora-nmstate-dev:latest \
quay://quay.io/nmstate/fedora-nmstate-dev:latest
docker://docker.io/nmstate/fedora-nmstate-dev:latest
```
It will be overwritten after the next commit to master, though.

View File

@ -15,8 +15,8 @@ TEST_TYPE_UNIT_PY38="unit_py38"
TEST_TYPE_INTEG="integ"
TEST_TYPE_INTEG_SLOW="integ_slow"
FEDORA_IMAGE_DEV="quay.io/nmstate/fedora-nmstate-dev"
CENTOS_IMAGE_DEV="quay.io/nmstate/centos8-nmstate-dev"
FEDORA_IMAGE_DEV="docker.io/nmstate/fedora-nmstate-dev"
CENTOS_IMAGE_DEV="docker.io/nmstate/centos8-nmstate-dev"
PYTEST_OPTIONS="--verbose --verbose \
--log-level=DEBUG \

View File

@ -1,12 +0,0 @@
## Quay
The images are automatically rebuilt on new GIT tags or pushes to any branch:
Configuration (here for `fedora-nmstate-dev`, the other build just specifies
a different container spec (Dockerfile location):
Container spec: /packaging/Dockerfile.fedora-nmstate-dev
Build context: /packaging
The tags are named after the branch/tag that triggered the build.

View File

@ -0,0 +1,41 @@
## Docker Hub
The images are automatically rebuilt on new GIT tags or pushes to the master branch:
`Dockerfile.fedora-nmstate-dev` by https://cloud.docker.com/u/nmstate/repository/docker/nmstate/fedora-nmstate-dev
The base image contains a common base that is used both for the development
image and for the distributed image.
Configuration (here for `fedora-nmstate-dev`, the other build just specifies
a different container spec (Dockerfile location):
Source repo: nmstate/nmstate
Autotest: Off
Repository Links: Off
Build rules:
Branch:
Source:master
Docker Tag:latest
Dockerfile location:Dockerfile.fedora-nmstate-dev
Build Context:/packaging
Autobuild:on
Build Caching:off
Tag:
Source: /^v[0-9.]+$/
Docker Tag:{sourceref}
Dockerfile location:Dockerfile.fedora-nmstate-dev
Build Context:/packaging
Autobuild:on
Build Caching:off
## Manual Building
The Nmstate user image builds the master master branch by default. To specify a
different commit or tag, specify the `SOURCE_COMMIT` build argument:
```shell
./build-container.sh --extra-args "--build-arg SOURCE_COMMIT=v0.0.6" nmstate/fedora-nmstate-dev
```

View File

@ -22,7 +22,7 @@ EXEC_PATH="$(dirname "$(realpath "$0")")"
PROJECT_PATH="$(dirname $EXEC_PATH)"
DEFAULT_BUILD_FLAGS="--no-cache --rm"
DEFAULT_TAG_PREFIX="quay.io/nmstate"
DEFAULT_TAG_PREFIX="docker.io/nmstate"
: ${CONTAINER_CMD:=podman}