Skip to content

Commit 6f3e345

Browse files
committed
Merge #58: Nix env changes
d7e7ac8 refactor: allow TAG customization on image build for dev env (nymius) c7a7625 fix: expose frigate port on dev environment (nymius) Pull request description: This PR adds the following: - New parameter TAG to change the reference to the built image in podman. - Exposes the frigate port to the podman host, to be able to interact with the protocol without working from the container. ACKs for top commit: nymius: self ACK d7e7ac8 Tree-SHA512: 07d92e5b557ae892c3c37c57e4357ef92d4ccd8fa843e88e14ca62bb5f8d82653fa0b6b8d5e37b845a1adb579c03248ab3f230f1c27a8221626e454c4f7f5a08
2 parents 542109a + d7e7ac8 commit 6f3e345

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

doc/tabconf7/justfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ build TAG="1.0.0" VERSION="29.0" RELEASE="29.0": machine
144144
ENTRYPOINT ["tail", "-f", "/dev/null"]
145145
EOF
146146

147-
image_exists=$(podman --connection sptabconf7 images --noheading -f reference=docker.io/nymius/sptabconf7:1.0.0 -f reference=localhost/regtest:1.0.0 --format 'table \{\{.ID\}\}')
147+
image_exists=$(podman --connection sptabconf7 images --noheading -f reference=docker.io/nymius/sptabconf7:{{TAG}} -f reference=localhost/regtest:{{TAG}} --format 'table \{\{.ID\}\}')
148148

149149
os=$(podman info --format json | jq -r '.host.os')
150150
arch=$(podman info --format json | jq -r '.host.arch')
@@ -156,7 +156,7 @@ build TAG="1.0.0" VERSION="29.0" RELEASE="29.0": machine
156156
target_arch="$aarch-linux-gnu" # podman setups a linux VM for us
157157
platform="linux/$aarch"
158158

159-
pulled_blobs=$(podman --connection sptabconf7 pull --platform $platform docker://docker.io/nymius/sptabconf7:$arch-1.0.0 2>&1)
159+
pulled_blobs=$(podman --connection sptabconf7 pull --platform $platform docker://docker.io/nymius/sptabconf7:$arch-{{TAG}} 2>&1)
160160

161161
if [ $? -ne 0 ]; then
162162
echo "Image not found on registry"
@@ -198,10 +198,10 @@ create FORCE="false" TAG="1.0.0" NAME="RegtestBitcoinEnv": (build TAG)
198198

199199
if [[ $local_build ]]; then
200200
echo "Creating from local build"
201-
podman --connection sptabconf7 create --name {{NAME}} --publish 18443:18443 --publish 18444:18444 --publish 3002:3002 --publish 3003:3003 --publish 3004:3004 --publish 60401:60401 localhost/regtest:{{TAG}}
201+
podman --connection sptabconf7 create --name {{NAME}} --publish 18443:18443 --publish 18444:18444 --publish 3002:3002 --publish 3003:3003 --publish 3004:3004 --publish 60401:60401 --publish 57001:57001 localhost/regtest:{{TAG}}
202202
elif [[ $external_pull ]]; then
203203
echo "Creating from external pull"
204-
podman --connection sptabconf7 create --name {{NAME}} --publish 18443:18443 --publish 18444:18444 --publish 3002:3002 --publish 3003:3003 --publish 3004:3004 --publish 60401:60401 docker.io/nymius/sptabconf7:$arch-{{TAG}}
204+
podman --connection sptabconf7 create --name {{NAME}} --publish 18443:18443 --publish 18444:18444 --publish 3002:3002 --publish 3003:3003 --publish 3004:3004 --publish 60401:60401 --publish 57001:57001 docker.io/nymius/sptabconf7:$arch-{{TAG}}
205205
fi
206206

207207
[group("Podman")]
@@ -217,7 +217,7 @@ startvm:
217217

218218
[group("Podman")]
219219
[doc("Start your podman machine and regtest environment")]
220-
startcontainer: (create "false" "1.0.0")
220+
startcontainer FORCE="false" TAG="1.0.0": (create FORCE TAG)
221221
#!/usr/bin/env bash
222222
container_state=$(podman --connection sptabconf7 ps --format json | jq -r '.[] | select(.Names[] | contains("RegtestBitcoinEnv")) | .State')
223223
if [ "$container_state" = "running" ]; then

0 commit comments

Comments
 (0)