mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-09 10:47:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1381 from owncloud/switch_to_opencontainer_annotation

Browse Source 
switch to opencontainers annotation for docker images
This commit is contained in:
Willy Kloucek
2021-02-02 14:54:33 +01:00
committed by GitHub
parent df43388e88 370cd1c8f6
commit 77533a94a3
5 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.drone.star
View File

@@ -695,6 +695,11 @@ def dockerReleases(ctx):
return pipelines
def dockerRelease(ctx, arch):
build_args = [
'REVISION=%s' % (ctx.build.commit),
'VERSION=%s' % (ctx.build.ref.replace("refs/tags/", "") if ctx.build.event == "tag" else "latest")
]
return {
'kind': 'pipeline',
'type': 'docker',
@@ -716,6 +721,7 @@ def dockerRelease(ctx, arch):
'tags': 'linux-%s' % (arch),
'dockerfile': 'ocis/docker/Dockerfile.linux.%s' % (arch),
'repo': ctx.repo.slug,
'build_args': build_args,
},
'when': {
'ref': {
@@ -740,7 +746,8 @@ def dockerRelease(ctx, arch):
'context': 'ocis',
'auto_tag_suffix': 'linux-%s' % (arch),
'dockerfile': 'ocis/docker/Dockerfile.linux.%s' % (arch),
'repo': ctx.repo.slug,
'repo': ctx.build.commit,
'build_args': build_args,
},
'when': {
'ref': {

5
changelog/unreleased/opencontainers-labels.md Normal file
View File

@@ -0,0 +1,5 @@
Enhancement: Switch to opencontainers annotation scheme
Switch docker image annotation scheme to org.opencontainers standard because org.label-schema is depreciated.
https://github.com/owncloud/ocis/pull/1381

16
ocis/docker/Dockerfile.linux.amd64
View File

@@ -1,5 +1,8 @@
FROM amd64/alpine:3.12
ARG VERSION=""
ARG REVISION=""
RUN apk update && \
apk upgrade && \
apk add ca-certificates mailcap && \
@@ -7,9 +10,16 @@ RUN apk update && \
echo 'hosts: files dns' >| /etc/nsswitch.conf
LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
org.label-schema.name="ownCloud Infinite Scale" \
org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0"
org.opencontainers.image.title="ownCloud Infinite Scale" \
org.opencontainers.image.vendor="ownCloud GmbH" \
org.opencontainers.image.authors="ownCloud GmbH" \
org.opencontainers.image.description="oCIS - ownCloud Infinite Scale is a modern file-sync and share platform" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.documentation="https://github.com/owncloud/ocis" \
org.opencontainers.image.url="https://hub.docker.com/r/owncloud/ocis" \
org.opencontainers.image.source="https://github.com/owncloud/ocis" \
org.opencontainers.image.version="${VERSION}" \
org.opencontainers.image.revision="${REVISION}"
EXPOSE 9200/tcp

16
ocis/docker/Dockerfile.linux.arm
View File

@@ -1,5 +1,8 @@
FROM arm32v6/alpine:3.12
ARG VERSION=""
ARG REVISION=""
RUN apk update && \
apk upgrade && \
apk add ca-certificates mailcap && \
@@ -7,9 +10,16 @@ RUN apk update && \
echo 'hosts: files dns' >| /etc/nsswitch.conf
LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
org.label-schema.name="ownCloud Infinite Scale" \
org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0"
org.opencontainers.image.title="ownCloud Infinite Scale" \
org.opencontainers.image.vendor="ownCloud GmbH" \
org.opencontainers.image.authors="ownCloud GmbH" \
org.opencontainers.image.description="oCIS - ownCloud Infinite Scale is a modern file-sync and share platform" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.documentation="https://github.com/owncloud/ocis" \
org.opencontainers.image.url="https://hub.docker.com/r/owncloud/ocis" \
org.opencontainers.image.source="https://github.com/owncloud/ocis" \
org.opencontainers.image.version="${VERSION}" \
org.opencontainers.image.revision="${REVISION}"
EXPOSE 9200/tcp

16
ocis/docker/Dockerfile.linux.arm64
View File

@@ -1,5 +1,8 @@
FROM arm64v8/alpine:3.12
ARG VERSION=""
ARG REVISION=""
RUN apk update && \
apk upgrade && \
apk add ca-certificates mailcap && \
@@ -7,9 +10,16 @@ RUN apk update && \
echo 'hosts: files dns' >| /etc/nsswitch.conf
LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
org.label-schema.name="ownCloud Infinite Scale" \
org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0"
org.opencontainers.image.title="ownCloud Infinite Scale" \
org.opencontainers.image.vendor="ownCloud GmbH" \
org.opencontainers.image.authors="ownCloud GmbH" \
org.opencontainers.image.description="oCIS - ownCloud Infinite Scale is a modern file-sync and share platform" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.documentation="https://github.com/owncloud/ocis" \
org.opencontainers.image.url="https://hub.docker.com/r/owncloud/ocis" \
org.opencontainers.image.source="https://github.com/owncloud/ocis" \
org.opencontainers.image.version="${VERSION}" \
org.opencontainers.image.revision="${REVISION}"
EXPOSE 9200/tcp