diff --git a/.drone.yml b/.drone.yml index b7ef83d..58a29c6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,7 +53,7 @@ steps: - hugo -s ./src - name: Build and push the docker image - image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:80ffd53372652576fa3c36a56b351b448a025c6a + image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:7d9add5c1ff2d510ff32ebabebf4da5086006498 privileged: true depends_on: - Test a build @@ -64,7 +64,7 @@ steps: - ./scripts/build-container.pl - name: Sync pictures from lfs to Minio - image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:80ffd53372652576fa3c36a56b351b448a025c6a + image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:7d9add5c1ff2d510ff32ebabebf4da5086006498 depends_on: - Test a build environment: @@ -76,7 +76,7 @@ steps: - ./scripts/upload-media.pl - name: Deploy the application - image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:80ffd53372652576fa3c36a56b351b448a025c6a + image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:7d9add5c1ff2d510ff32ebabebf4da5086006498 depends_on: - Build and push the docker image - Sync pictures from lfs to Minio @@ -93,7 +93,7 @@ steps: - ./scripts/deploy-app.pl - name: Cleanup everything - image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:80ffd53372652576fa3c36a56b351b448a025c6a + image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:7d9add5c1ff2d510ff32ebabebf4da5086006498 depends_on: - Deploy the application environment: diff --git a/scripts/build-container.pl b/scripts/build-container.pl index 9cf6765..2f39479 100755 --- a/scripts/build-container.pl +++ b/scripts/build-container.pl @@ -17,16 +17,16 @@ my $image_name = $ENV{'DRONE_REPO'} || "badhouseplants/badhouseplants-net"; my $tag = "$container_registry/$image_name:$git_commit_sha"; my $username = $ENV{'DRONE_USERNAME'} || "allanger"; my $password = $ENV{'GITEA_TOKEN'} || "YOU NOT AUTHORIZED, PAL"; -print `buildah login --username $username --password $password $container_registry` or die; -print `buildah build -t $tag .` or die; -print `buildah push $tag` or die; +print `buildah login --username $username --password $password $container_registry` or die $!; +print `buildah build -t $tag .` or die $!; +print `buildah push $tag` or die $!; # ------------------------------------------------- -# -- Push the lates if the branch is main +# -- Push the latest if the branch is main # ------------------------------------------------- if ( $git_branch eq $main_branch) { my $latest_tag = "$container_registry/$image_name:latest"; - print `buildah tag $tag $latest_tag` or die; - print `buildah push $latest_tag` or die; + print `buildah tag $tag $latest_tag` or die $!; + print `buildah push $latest_tag` or die $!; } print "Thanks!\n";