proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 22:26:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "tests/topotests: Change docker build context"

Browse Source 
This reverts commit 659782730b.

Apparently, the build context is inferred from the Dockerfile path.
Yay for sensible documentation. :/

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
This commit is contained in:
Christian Franke 2018-12-01 19:40:38 +01:00
parent d801bfae85
commit 54b60cf9b0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/topotests/Dockerfile
View File

@ -70,7 +70,7 @@ RUN echo "" >> /etc/security/limits.conf; \
echo "root hard core unlimited" >> /etc/security/limits.conf echo "root hard core unlimited" >> /etc/security/limits.conf
# Copy run scripts to facilitate users wanting to run the tests # Copy run scripts to facilitate users wanting to run the tests
COPY tests/topotests/docker/inner /opt/topotests COPY docker/inner /opt/topotests
WORKDIR /root/topotests WORKDIR /root/topotests
ENV PATH "$PATH:/opt/topotests" ENV PATH "$PATH:/opt/topotests"

3
tests/topotests/docker/build.sh
View File

@ -22,10 +22,9 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
cd "$(dirname "$0")"/../../.. cd "$(dirname "$0")"/..
exec docker build --pull \ exec docker build --pull \
--compress \ --compress \
-t frrouting/frr:topotests-latest \ -t frrouting/frr:topotests-latest \
-f tests/topotests/Dockerfile \
. .