fossilfranv/monica
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use opencontainers annotations (#4)

Browse Source
This commit is contained in:
Alexis Saettler 2020-03-02 22:18:11 +01:00 committed by GitHub
parent dbb9e8fd83
commit 424ad3109b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile-alpine.template
View File

@ -1,5 +1,6 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%
# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
%%LABEL%%
# entrypoint.sh dependencies

1
Dockerfile-debian.template
View File

@ -1,5 +1,6 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%
# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
%%LABEL%%
# entrypoint.sh dependencies

17
apache/Dockerfile
View File

@ -1,12 +1,15 @@
FROM php:7.3-apache
# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL maintainer="Alexis Saettler <alexis@saettler.org> (@asbiin)" \
org.label-schema.name="MonicaHQ, the Personal Relationship Manager" \
org.label-schema.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.label-schema.url="https://monicahq.com" \
org.label-schema.vcs-url="https://github.com/monicahq/monica" \
org.label-schema.vendor="Monica" \
org.label-schema.schema-version="1.0"
org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \
org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.opencontainers.image.url="https://monicahq.com" \
org.opencontainers.image.revision="e3c79ada95ba6b34281628ee044a7bf0e9920f26" \
org.opencontainers.image.source="https://github.com/monicahq/docker" \
org.opencontainers.image.vendor="Monica" \
org.opencontainers.image.version="v2.16.0"
# entrypoint.sh dependencies
RUN set -ex; \
@ -63,7 +66,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.5; \
pecl install redis-5.1.1; \
pecl install redis-5.2.0; \
\
docker-php-ext-enable \
apcu \

17
fpm-alpine/Dockerfile
View File

@ -1,12 +1,15 @@
FROM php:7.3-fpm-alpine
# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL maintainer="Alexis Saettler <alexis@saettler.org> (@asbiin)" \
org.label-schema.name="MonicaHQ, the Personal Relationship Manager" \
org.label-schema.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.label-schema.url="https://monicahq.com" \
org.label-schema.vcs-url="https://github.com/monicahq/monica" \
org.label-schema.vendor="Monica" \
org.label-schema.schema-version="1.0"
org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \
org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.opencontainers.image.url="https://monicahq.com" \
org.opencontainers.image.revision="e3c79ada95ba6b34281628ee044a7bf0e9920f26" \
org.opencontainers.image.source="https://github.com/monicahq/docker" \
org.opencontainers.image.vendor="Monica" \
org.opencontainers.image.version="v2.16.0"
# entrypoint.sh dependencies
RUN set -ex; \
@ -62,7 +65,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.5; \
pecl install redis-5.1.1; \
pecl install redis-5.2.0; \
\
docker-php-ext-enable \
apcu \

17
fpm/Dockerfile
View File

@ -1,12 +1,15 @@
FROM php:7.3-fpm
# opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL maintainer="Alexis Saettler <alexis@saettler.org> (@asbiin)" \
org.label-schema.name="MonicaHQ, the Personal Relationship Manager" \
org.label-schema.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.label-schema.url="https://monicahq.com" \
org.label-schema.vcs-url="https://github.com/monicahq/monica" \
org.label-schema.vendor="Monica" \
org.label-schema.schema-version="1.0"
org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \
org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.opencontainers.image.url="https://monicahq.com" \
org.opencontainers.image.revision="e3c79ada95ba6b34281628ee044a7bf0e9920f26" \
org.opencontainers.image.source="https://github.com/monicahq/docker" \
org.opencontainers.image.vendor="Monica" \
org.opencontainers.image.version="v2.16.0"
# entrypoint.sh dependencies
RUN set -ex; \
@ -63,7 +66,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.5; \
pecl install redis-5.1.1; \
pecl install redis-5.2.0; \
\
docker-php-ext-enable \
apcu \

18
update.sh
View File

@ -29,12 +29,14 @@ RUN set -eu; sed -ri -e \"s!/var/www/html!\\\${APACHE_DOCUMENT_ROOT}!g\" /etc/ap
)
label="LABEL maintainer=\"Alexis Saettler <alexis@saettler.org> (@asbiin)\" \\\\\\n\
org.label-schema.name=\"MonicaHQ, the Personal Relationship Manager\" \\\\\\n\
org.label-schema.description=\"This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you.\" \\\\\\n\
org.label-schema.url=\"https://monicahq.com\" \\\\\\n\
org.label-schema.vcs-url=\"https://github.com/monicahq/monica\" \\\\\\n\
org.label-schema.vendor=\"Monica\" \\\\\\n\
org.label-schema.schema-version=\"1.0\""
org.opencontainers.image.authors=\"Alexis Saettler <alexis@saettler.org>\" \\\\\\n\
org.opencontainers.image.title=\"MonicaHQ, the Personal Relationship Manager\" \\\\\\n\
org.opencontainers.image.description=\"This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you.\" \\\\\\n\
org.opencontainers.image.url=\"https://monicahq.com\" \\\\\\n\
org.opencontainers.image.revision=\"%%COMMIT%%\" \\\\\\n\
org.opencontainers.image.source=\"https://github.com/monicahq/docker\" \\\\\\n\
org.opencontainers.image.vendor=\"Monica\" \\\\\\n\
org.opencontainers.image.version=\"%%VERSION%%\""
apcu_version="$(
git ls-remote --tags https://github.com/krakjoe/apcu.git \
@ -70,6 +72,7 @@ declare -A pecl_versions=(
)
version="$(curl -fsSL 'https://api.github.com/repos/monicahq/monica/releases/latest' | jq -r '.tag_name')"
commit="$(curl -fsSL 'https://api.github.com/repos/monicahq/monica/tags' | jq -r 'map(select(.name | contains ("'$version'"))) | .[].commit.sha')"
sha512="$(curl -fsSL "https://github.com/monicahq/monica/releases/download/$version/monica-$version.sha512" | grep monica-$version.tar.bz2 | awk '{ print $1 }')"
set -x
@ -83,10 +86,11 @@ for variant in apache fpm fpm-alpine; do
sed -e '
s/%%VARIANT%%/'"$variant"'/;
s/%%PHP_VERSION%%/'"$phpVersion"'/;
s#%%LABEL%%#'"$label"'#;
s/%%VERSION%%/'"$version"'/;
s/%%COMMIT%%/'"$commit"'/;
s/%%SHA512%%/'"$sha512"'/;
s/%%CMD%%/'"${cmd[$variant]}"'/;
s#%%LABEL%%#'"$label"'#;
s#%%APACHE_DOCUMENT%%#'"${document[$variant]}"'#;
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/;
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/;