File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -51,15 +51,16 @@ ifeq ($(OS_NAME),Darwin)
5151 (( SECONDS < 15 )) || exit 1 ; \
5252 done
5353 # # Start docker only when necessary. xargs is necessary to trim whitespace and carriage returns.
54- @test -n "`docker container ls -q -f name='rocky8-skill' | xargs`" || \
55- docker run -dit --rm \
56- --platform linux/amd64 \
57- --network none \
58- --volume ~/projects/skill# :/skill# \
59- --volume ~/Docker/centos7/Cadence/installs/IC618:/eda/cadence/installs/IC618 \
60- --env CDS_INST_DIR=/eda/cadence/installs/IC618 \
61- --name rocky8-skill \
54+ @test -n "`docker container ls -q -f name='rocky8-skill' | xargs`" || \
55+ docker run -dit --rm \
56+ --platform linux/amd64 \
57+ --network none \
58+ --volume ~/projects/skill# :/skill# \
59+ --name rocky8-skill \
6260 rocky8-skill
61+ # --volume ~/Docker/centos7/Cadence/installs/IC618_SKILL_only:/eda/cadence/installs/IC618 \
62+ # --env "CDS_INST_DIR=/eda/cadence/installs/IC618" \
63+ # --volume ~/Docker/centos7/Cadence/installs/IC618:/eda/cadence/installs/IC618
6364 # # Check if docker is running
6465 # test "$( docker container inspect -f '{{.State.Running}}' rocky8-skill )" = "true"
6566endif
@@ -85,7 +86,7 @@ ifeq ($(OS_NAME),Linux)
8586 PATH ="$$HOME/.local/bin:$$PATH" \
8687 EXAMPLE="$(filter-out $@ , $(MAKECMDGOALS ) ) " \
8788 bash -c 'shellspec --shell /bin/bash --color --quick --fail-fast -fd $${EXAMPLE:+--example }$$EXAMPLE $$SHELLSPEC_EXTRA_ARGS'
88- else
89+ else
8990 @make container
9091 @docker exec \
9192 --env "SHELLSPEC_EXTRA_ARGS" \
You can’t perform that action at this time.
0 commit comments