search

xcat2 / xcat-docker

Repository to build Docker image for xCAT
5 stars 5 forks source link

Enhance the dockerfile to enable build container with xcat dailybuild repo #8

Closed robin2008 closed 5 years ago

robin2008 commented 5 years ago

dailybuild use different repo directory: https://xcat.org/files/xcat/repos/apt/devel/core-snap/ https://xcat.org/files/xcat/repos/yum/devel/core-snap/

But the official will be https://xcat.org/files/xcat/repos/yum/latest/xcat-core/

robin2008 commented 5 years ago

UT:

docker build --build-arg xcat_version=devel -t xcat-devel .
...

--2019-03-27 08:43:54--  https://xcat.org/files/xcat/repos/yum/devel/core-snap/xcat-core.repo
Resolving xcat.org (xcat.org)... 166.70.135.166
Connecting to xcat.org (xcat.org)|166.70.135.166|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 204
Saving to: '/etc/yum.repos.d/xcat-core.repo'

     0K                                                       100%  573K=0s

2019-03-27 08:43:57 (573 KB/s) - '/etc/yum.repos.d/xcat-core.repo' saved [204/204]

--2019-03-27 08:43:57--  https://xcat.org/files/xcat/repos/yum/devel/xcat-dep/rh7/x86_64/xcat-dep.repo
Resolving xcat.org (xcat.org)... 166.70.135.166
Connecting to xcat.org (xcat.org)|166.70.135.166|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 209
Saving to: '/etc/yum.repos.d/xcat-dep.repo'

     0K                                                       100% 9.32M=0s

2019-03-27 08:43:58 (9.32 MB/s) - '/etc/yum.repos.d/xcat-dep.repo' saved [209/209]

we can see that it point to https://xcat.org/files/xcat/repos/yum/devel/core-snap/xcat-core.repo

For ubuntu, the result is the same

docker build --build-arg xcat_version=devel -f ubuntu/Dockerfile -t xcat-devel:xenial .

...
Removing intermediate container c10d0dc215c0
 ---> bdf3ba02b259
Step 18/19 : VOLUME [ "/xcatdata", "/var/log/xcat" ]
 ---> Running in ad01cb977ac4
Removing intermediate container ad01cb977ac4
 ---> 3284788da4e3
Step 19/19 : CMD [ "/sbin/init" ]
 ---> Running in 75d4ae38ea8b
Removing intermediate container 75d4ae38ea8b
 ---> 2af270a52b30
Successfully built 2af270a52b30
Successfully tagged xcat-devel:xenial
neo954 commented 5 years ago

The patch looks good.

neo954 commented 5 years ago

Will merge this one.