Skip to content

Commit

Permalink
Remove separate function to build stylus framework image
Browse files Browse the repository at this point in the history
Earthly stylus goal is now building this goal two
  • Loading branch information
oz123 committed Oct 23, 2023
1 parent 8d23a9a commit 4cf68d5
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions test-two-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,11 @@ function build_provider_k3s(){
docker push $OCI_REGISTRY/provider-k3s:v0.0.0-${PROVIDER_K3S_HASH}
}

function build_stylus_framework(){
echo "Build framework"
earthly --allow-privileged --output +framework-image --platform=linux/amd64 \
--BASE_IMAGE=quay.io/kairos/core-opensuse-leap:v2.3.2 \
--IMAGE_REPOSITORY=$OCI_REGISTRY \
--VERSION=twonode
docker push $OCI_REGISTRY/stylus-framework-linux-amd64:twonode
}


function build_stylus_package(){
echo "Build Stylus"
earthly --push +package --IMAGE_REPOSITORY=${OCI_REGISTRY}
docker push $OCI_REGISTRY/stylus-linux-amd64:v0.0.0-${STYLUS_HASH}
docker push $OCI_REGISTRY/stylus-framework-linux-amd64:v0.0.0-${STYLUS_HASH}
}


Expand Down Expand Up @@ -98,7 +89,7 @@ function main(){
STYLUS_HASH=$(git describe --always)
( docker image ls --format "{{.Repository}}:{{.Tag}}" | grep -q $OCI_REGISTRY/stylus-linux-amd64:v0.0.0-${STYLUS_HASH} ) || ( build_stylus_package && build_stylus_framework )
( docker image ls --format "{{.Repository}}:{{.Tag}}" | grep -q $OCI_REGISTRY/stylus-linux-amd64:v0.0.0-${STYLUS_HASH} ) || ( build_stylus_package )
cd ../CanvOS
Expand Down

0 comments on commit 4cf68d5

Please sign in to comment.