From 0499617ec157a2d0a170325907d0909df6f6927e Mon Sep 17 00:00:00 2001 From: Mike Sutton Date: Sat, 25 Mar 2023 17:13:59 +0100 Subject: [PATCH] added fg logo and improved drone.yml --- .drone.yml | 30 ++++++++++++++++-------------- public/fitness_giving/logo.svg | 7 +++++++ 2 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 public/fitness_giving/logo.svg diff --git a/.drone.yml b/.drone.yml index f9b466a..5077d39 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,11 +16,11 @@ volumes: steps: - name: notify_start - image: plugins/slack + image: appleboy/drone-telegram settings: - webhook: https://team.wizewerx.tech/hooks/5eq841fropn3prt4kzgoaoprgr - channel: builds - template: > + token: 6138074869:AAHQcUundL70GMUZH-AVala4Ej8dKNGLim4 + to: 1558971280 + message: > {{uppercase repo.name}}:{{uppercase build.branch}}:{{build.number}} CI build started - name: deploy image: wizewerx/wizewerx-docker-compose @@ -32,25 +32,27 @@ steps: from_secret: registryLogins commands: - mkdir -p "/root/.docker" && echo $DOCKER_AUTH_CONFIG > "/root/.docker/config.json" - - pwd - - export BUILD_TARGET=wizewerx/${DRONE_REPO_NAME} - - docker build -t $BUILD_TARGET . + - export BUILD_TARGET=wizewerx/${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH} + - export PULL_IMAGE=`docker manifest inspect $BUILD_TARGET > /dev/null;echo $?` + - if [[ "$PULL_IMAGE" -eq 0 ]]; then docker pull $BUILD_TARGET ;fi + - echo ${DRONE_COMMIT_SHA} > ./version.txt + - docker build --cache-from $BUILD_TARGET --build-arg GEM_CACHE=$BUILD_TARGET -f ./docker/Dockerfile -t $BUILD_TARGET . - docker push $BUILD_TARGET - trigger: + when: branch: - master + - production - name: notify_end - image: plugins/slack + image: appleboy/drone-telegram settings: - webhook: https://team.wizewerx.tech/hooks/5eq841fropn3prt4kzgoaoprgr - channel: builds - username: mike - template: > + token: 6138074869:AAHQcUundL70GMUZH-AVala4Ej8dKNGLim4 + to: 1558971280 + message: > {{uppercase repo.name}}:{{uppercase build.branch}}:{{build.number}}{{#success build.status}} succeeded. Good job. {{else}} failed. FIX THE BUILD!!!.{{/success}} Build took {{since build.started}} when: status: [ success, failure ] - trigger: branch: - master + - production diff --git a/public/fitness_giving/logo.svg b/public/fitness_giving/logo.svg new file mode 100644 index 0000000..0ed8206 --- /dev/null +++ b/public/fitness_giving/logo.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file