Skip to content

Commit 0677931

Browse files
authored
chore: use full qualified comtainer images (#138)
1 parent 9cbdf13 commit 0677931

File tree

3 files changed

+24
-33
lines changed

3 files changed

+24
-33
lines changed

.drone.yml

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ platform:
88

99
steps:
1010
- name: tags
11-
image: thegeeklab/docker-autotag
11+
image: quay.io/thegeeklab/docker-autotag
1212
environment:
1313
DOCKER_AUTOTAG_FORCE_LATEST: True
1414
DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
1515
DOCKER_AUTOTAG_OUTPUT_FILE: .tags
1616
DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
1717

1818
- name: dryrun
19-
image: plugins/docker
19+
image: docker.io/plugins/docker
2020
settings:
2121
build_args_from_env:
2222
- COLLABORA_TOKEN
@@ -29,9 +29,20 @@ steps:
2929
when:
3030
ref:
3131
- refs/pull/**
32+
depends_on:
33+
- tags
3234

33-
- name: publish
34-
image: plugins/docker
35+
- name: changelog
36+
image: quay.io/thegeeklab/git-chglog
37+
commands:
38+
- git fetch -tq
39+
- git-chglog --no-color --no-emoji ${DRONE_TAG:---next-tag unreleased unreleased}
40+
- git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
41+
depends_on:
42+
- dryrun
43+
44+
- name: publish-registry
45+
image: docker.io/plugins/docker
3546
settings:
3647
build_args_from_env:
3748
- COLLABORA_TOKEN
@@ -49,31 +60,11 @@ steps:
4960
ref:
5061
- refs/heads/main
5162
- refs/tags/**
52-
53-
trigger:
54-
ref:
55-
- refs/heads/main
56-
- refs/tags/**
57-
- refs/pull/**
58-
59-
---
60-
kind: pipeline
61-
name: release
62-
63-
platform:
64-
os: linux
65-
arch: amd64
66-
67-
steps:
68-
- name: changelog
69-
image: thegeeklab/git-chglog
70-
commands:
71-
- git fetch -tq
72-
- git-chglog --no-color --no-emoji ${DRONE_TAG:---next-tag unreleased unreleased}
73-
- git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
63+
depends_on:
64+
- changelog
7465

7566
- name: release
76-
image: plugins/github-release
67+
image: docker.io/plugins/github-release
7768
settings:
7869
api_key:
7970
from_secret: github_token
@@ -83,16 +74,15 @@ steps:
8374
when:
8475
ref:
8576
- refs/tags/**
77+
depends_on:
78+
- publish-registry
8679

8780
trigger:
8881
ref:
8982
- refs/heads/main
9083
- refs/tags/**
9184
- refs/pull/**
9285

93-
depends_on:
94-
- container
95-
9686
---
9787
kind: pipeline
9888
name: notifications
@@ -103,7 +93,7 @@ platform:
10393

10494
steps:
10595
- name: notify
106-
image: plugins/slack
96+
image: docker.io/plugins/slack
10797
settings:
10898
channel:
10999
from_secret: slack_channel
@@ -122,6 +112,6 @@ trigger:
122112
- failure
123113

124114
depends_on:
125-
- release
115+
- container
126116

127117
...

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM amd64/debian:11-slim@sha256:f7d141c1ec6af549958a7a2543365a7829c2cdc4476308ec2e182f8a7c59b519
1+
FROM docker.io/amd64/debian:11-slim@sha256:f7d141c1ec6af549958a7a2543365a7829c2cdc4476308ec2e182f8a7c59b519
22

33
LABEL maintainer="ownCloud DevOps <devops@owncloud.com>"
44
LABEL org.opencontainers.image.authors="ownCloud DevOps <devops@owncloud.com>"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
[![Build Status](https://drone.owncloud.com/api/badges/owncloud-ops/collabora/status.svg)](https://drone.owncloud.com/owncloud-ops/collabora)
44
[![Docker Hub](https://img.shields.io/badge/docker-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/owncloudops/collabora)
5+
[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/owncloudops/collabora)
56

67
Custom container image for [Collabora Online](https://www.collaboraoffice.com/de/collabora-online/).
78

0 commit comments

Comments
 (0)