Refactor DTS dockerfile and startup script to be used to run DAQ in a…#933
Refactor DTS dockerfile and startup script to be used to run DAQ in a…#933anurag6 merged 3 commits intofaucetsdn:masterfrom
Conversation
… container locally
|
I left the dts/ files that I edited in place so that it is easier to see the changes made. I will remove dts/Dockerfile.dts and dts/start_service once I test and finalize the PR. |
Codecov Report
@@ Coverage Diff @@
## master #933 +/- ##
==========================================
- Coverage 82.51% 82.48% -0.04%
==========================================
Files 46 46
Lines 5862 5862
==========================================
- Hits 4837 4835 -2
- Misses 1025 1027 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
grafnu
left a comment
grafnu
left a comment
There was a problem hiding this comment.
Mostly looks good -- the structure seems fine...
bin/build_daq
Outdated
| tag= | ||
|
|
||
| if [ "$1" == "dts" ]; then | ||
| tag="dts" |
There was a problem hiding this comment.
add "shift" just for completeness
bin/build_daq
Outdated
| tag="dts" | ||
| fi | ||
|
|
||
| if [ -z "$tag" ]; then |
There was a problem hiding this comment.
I would default tag to daq at the top, rather than a replace-if-empty conditional
bin/start_daq_container
Outdated
| @@ -0,0 +1,25 @@ | |||
| #!/bin/bash -x | |||
docker/modules/Dockerfile.daq
Outdated
| COPY cmd/ cmd/ | ||
| COPY config/ config/ | ||
| COPY resources/ resources/ | ||
| #COPY docker/include/bin/start_daq bin/ |
There was a problem hiding this comment.
Wasn't using the newer script yet. Changed.
bin/build_daq
Outdated
| tag="dts" | ||
| fi | ||
|
|
||
| if [ -z "$tag" ]; then |
There was a problem hiding this comment.
this is not really an image tag; it's part of the image name.
There was a problem hiding this comment.
Changed to image_name
grafnu
left a comment
grafnu
left a comment
There was a problem hiding this comment.
Just one file to rename, and then good to go!
| shift | ||
| fi | ||
|
|
||
| bin/setup_remote faucet |
There was a problem hiding this comment.
Script is misnamed since it's not "building daq" as such... so maybe "build_daq_container"? (dts was specific to it being a container, daq is not so qualified).
There was a problem hiding this comment.
Makes sense. Canged.
3 participants
… container locally