From add04f888baeb77d738ae0a46317ed934f372f04 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 26 Apr 2023 06:45:41 +0200 Subject: [PATCH] build: Use the builder image everywhere --- .drone.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6ee51f5..7a9a7e1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -75,7 +75,7 @@ steps: - ./scripts/upload-media.pl - name: Deploy a preview ApplicationSet - image: alpine/k8s:1.24.10 + image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:80ffd53372652576fa3c36a56b351b448a025c6a when: branch: exclude: @@ -89,7 +89,6 @@ steps: commands: - mkdir $HOME/.kube - echo $KUBECONFIG_CONTENT | base64 -d > $HOME/.kube/config - - apk update --no-cache && apk add yq gettext openssl - export ARGO_APP_CHART_VERSION=`cat chart/Chart.yaml | yq '.version'` - export ARGO_APP_BRANCH=$DRONE_BRANCH - export ARGO_APP_HOSTNAME="${DRONE_BRANCH}-dev.badhouseplants.net" @@ -106,7 +105,7 @@ steps: - kubectl apply -f /tmp/appset.yaml - name: Deploy a main ApplicationSet - image: alpine/k8s:1.24.10 + image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:80ffd53372652576fa3c36a56b351b448a025c6a when: branch: - main @@ -123,7 +122,6 @@ steps: commands: - mkdir $HOME/.kube - echo $KUBECONFIG_CONTENT | base64 -d > $HOME/.kube/config - - apk update --no-cache && apk add yq gettext - export ARGO_APP_CHART_VERSION=`cat chart/Chart.yaml | yq '.version'` - export ARGO_APP_BRANCH=$DRONE_BRANCH - export ARGO_APP_IMAGE_TAG=$DRONE_COMMIT_SHA @@ -140,7 +138,7 @@ steps: - kubectl apply -f /tmp/appset.yaml - name: Sync application - image: argoproj/argocd + image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:80ffd53372652576fa3c36a56b351b448a025c6a depends_on: - Deploy a main ApplicationSet - Deploy a preview ApplicationSet @@ -154,7 +152,7 @@ steps: - argocd app wait -l app=badhouseplants -l branch=$DRONE_BRANCH - name: Cleanup everything - image: rclone/rclone:latest + image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:80ffd53372652576fa3c36a56b351b448a025c6a depends_on: - Sync application environment: @@ -169,11 +167,6 @@ steps: from_secret: ARGOCD_AUTH_TOKEN commands: - echo "$RCLONE_CONFIG_CONTENT" > $RCLONE_CONFIG - - apk update - - apk add curl jq perl git yq - - curl -sSL -o argocd-linux-amd64 https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64 - - install -m 555 argocd-linux-amd64 /usr/local/bin/argocd - - rm argocd-linux-amd64 - ./scripts/cleanup.pl ---