diff --git a/README.md b/README.md index b795f7a..73bab39 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,3 @@ My static website written in Jekyll. Deployment through Concourse. - -`fly -t home set-pipeline --load-vars-from=secrets.yml -p static -c pipeline.yml` diff --git a/deploy.yml b/deploy.yml new file mode 100644 index 0000000..2c125c1 --- /dev/null +++ b/deploy.yml @@ -0,0 +1 @@ +fly -t home set-pipeline -l secrets.yml -l vars.yml -p static -c pipeline.yml diff --git a/pipeline.yml b/pipeline.yml index 7318246..a157228 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -4,7 +4,7 @@ resource_types: type: registry-image source: repository: git.pim.kunis.nl/pim/concourse-apprise-notifier - tag: 2f31a9abbbcdf29726e305cbf0702a581515f156eb5bfe09311a1232a941bb14 + tag: 1.1 resources: - name: site-repo @@ -18,6 +18,7 @@ resources: repository: git.pim.kunis.nl/pim/static username: pim password: ((api_key)) + tag: ((image_version)) icon: docker - name: apprise-notification type: apprise @@ -30,7 +31,6 @@ notify-failed: ¬ify-failed put: apprise-notification params: body: "Failed to deploy static website!" - no_get: true jobs: - name: build-static-website @@ -84,50 +84,11 @@ jobs: - | build ls image - cat image/digest | cut -d ":" -f 2- > image/tag - on_failure: - << : *notify-failed - - task: get-site-packages - config: - platform: linux - image_resource: - type: registry-image - source: - repository: badouralix/curl-jq - outputs: - - name: site-packages - run: - path: sh - args: - - -exc - - | - ls -lash - curl -X 'GET' 'https://git.pim.kunis.nl/api/v1/packages/pim?type=container&q=static' -H 'accept: application/json' | jq -rc 'map(.version) | .[]' > site-packages/packages.txt - cat site-packages/packages.txt - on_failure: - << : *notify-failed - - task: delete-old-packages - config: - platform: linux - image_resource: - type: registry-image - source: - repository: badouralix/curl-jq - inputs: - - name: site-packages - run: - path: sh - args: - - -exc - - | - ls -lash - while read pkg; do curl -X 'DELETE' "https://git.pim.kunis.nl/api/v1/packages/pim/container/static/$pkg?token=((api_key))" -H 'accept: application/json'; done < site-packages/packages.txt on_failure: << : *notify-failed - put: site-registry-image params: image: image/image.tar - additional_tags: image/tag on_failure: << : *notify-failed - name: deploy-static-website @@ -158,7 +119,7 @@ jobs: cp site-repo/ssh_config $HOME/.ssh/config echo "((private_key))" > $HOME/.ssh/id_ed25519 chmod 600 $HOME/.ssh/id_ed25519 - sed "s/TAG/$(cat site-registry-image/tag)/g" "site-repo/docker-stack.yml.template" > docker-stack.yml + sed "s/TAG/((image_version))/g" "site-repo/docker-stack.yml.template" > docker-stack.yml docker stack deploy --compose-file docker-stack.yml static on_success: put: apprise-notification diff --git a/vars.yml b/vars.yml new file mode 100644 index 0000000..5ae52dd --- /dev/null +++ b/vars.yml @@ -0,0 +1 @@ +image_version: "1.1"