fix: delete image after build or push, use orgsecret

This commit is contained in:
Markus Pesch 2021-01-08 17:38:45 +01:00
parent 390308609f
commit 3658b3b004
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
3 changed files with 11 additions and 13 deletions

View File

@ -3,7 +3,6 @@ type: docker
name: build-image-x86_64 name: build-image-x86_64
steps: steps:
- name: build-image-latest - name: build-image-latest
image: docker.io/volkerraschek/build-image:latest image: docker.io/volkerraschek/build-image:latest
commands: commands:
@ -21,33 +20,24 @@ steps:
- make container-image/push - make container-image/push
environment: environment:
CONTAINER_IMAGE_REGISTRY_PASSWORD: CONTAINER_IMAGE_REGISTRY_PASSWORD:
from_secret: CONTAINER_IMAGE_REGISTRY_PASSWORD from_secret: container_image_registry_password
volumes: volumes:
- name: docker_socket - name: docker_socket
path: /var/run/docker.sock path: /var/run/docker.sock
when: when:
branch: branch:
- master - master
event:
- push
- cron
- name: push-image-tagged - name: delete-image-latest
image: docker.io/volkerraschek/build-image:latest image: docker.io/volkerraschek/build-image:latest
commands: commands:
- make container-image/push - make container-image/delete
environment:
CONTAINER_IMAGE_VERSION: ${DRONE_TAG}
CONTAINER_IMAGE_REGISTRY_PASSWORD:
from_secret: CONTAINER_IMAGE_REGISTRY_PASSWORD
volumes: volumes:
- name: docker_socket - name: docker_socket
path: /var/run/docker.sock path: /var/run/docker.sock
when: when:
branch: branch:
- master - master
event:
- tag
- name: notify - name: notify
image: drillster/drone-email image: drillster/drone-email

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.env

View File

@ -37,6 +37,13 @@ container-image/build:
--tag ${CONTAINER_IMAGE_SHORT} \ --tag ${CONTAINER_IMAGE_SHORT} \
. .
# DELETE CONTAINER IMAGE
# ==============================================================================
PHONY:=container-image/delete
container-image/delete:
- ${CONTAINER_RUNTIME} image rm ${CONTAINER_IMAGE_FULL} ${CONTAINER_IMAGE_SHORT}
- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULL}
# PUSH CONTAINER IMAGE # PUSH CONTAINER IMAGE
# ============================================================================== # ==============================================================================
PHONY+=container-image/push PHONY+=container-image/push