Skip to content

Commit

Permalink
Update container image (#21)
Browse files Browse the repository at this point in the history
* Update container image

* fix license

* Fix linter issue
  • Loading branch information
Yi Tseng authored Jun 16, 2021
1 parent 758ee19 commit ebb51d9
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 62 deletions.
26 changes: 0 additions & 26 deletions .github/workflows/container-image.yaml

This file was deleted.

32 changes: 0 additions & 32 deletions Dockerfile

This file was deleted.

5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.PHONY: stratum-replay

current_dir=$(abspath $(dir $(MAKEFILE_LIST)))
IMAGE:=fabric-line-rate-test:0.0.1
IMAGE:=stratumproject/testvectors:ptf
SERVER_ADDR?=10.128.13.27
SWITCH_ADDR?=10.128.13.29
TEST?=int_single_flow
Expand All @@ -14,9 +14,6 @@ TREX_SCRIPTS:=$(current_dir)/trex-scripts
default:
@echo "Nothing here"

build-image:
@docker build -t $(IMAGE) . -f Dockerfile

.venv:
@python3 -m venv .venv

Expand Down
4 changes: 4 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
# SPDX-FileCopyrightText: Copyright 2021-present Open Networking Foundation.
# SPDX-License-Identifier: Apache-2.0
python3 -m control "$@"
2 changes: 2 additions & 0 deletions run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,7 @@ docker run --rm \
-v "${DIR}/tools:/workspace/tools" \
-v "${DIR}/tmp:/tmp" \
-w /workspace \
--mount "type=bind,source=$PWD/entrypoint.sh,target=/entrypoint.sh" \
--entrypoint /entrypoint.sh \
"${IMAGE}" \
"${TEST_ARGS[@]}"
File renamed without changes.

0 comments on commit ebb51d9

Please sign in to comment.