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

Fix version label set (#24)

Browse Source
This commit is contained in:
Alexis Saettler 2020-08-26 08:31:31 +02:00 committed by GitHub
parent 001f54d0fb
commit 7a83d35700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/Dockerfile
View File

@ -129,7 +129,7 @@ WORKDIR /var/www/html
# Define Monica version # Define Monica version
ENV MONICA_VERSION v2.18.0 ENV MONICA_VERSION v2.18.0
LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \ LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
org.opencontainers.image.version="%%VERSION%%" org.opencontainers.image.version="v2.18.0"
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

2
fpm-alpine/Dockerfile
View File

@ -108,7 +108,7 @@ WORKDIR /var/www/html
# Define Monica version # Define Monica version
ENV MONICA_VERSION v2.18.0 ENV MONICA_VERSION v2.18.0
LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \ LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
org.opencontainers.image.version="%%VERSION%%" org.opencontainers.image.version="v2.18.0"
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \

2
fpm/Dockerfile
View File

@ -115,7 +115,7 @@ WORKDIR /var/www/html
# Define Monica version # Define Monica version
ENV MONICA_VERSION v2.18.0 ENV MONICA_VERSION v2.18.0
LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \ LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
org.opencontainers.image.version="%%VERSION%%" org.opencontainers.image.version="v2.18.0"
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

2
update.sh
View File

@ -104,7 +104,7 @@ for variant in apache fpm fpm-alpine; do
s/%%VARIANT%%/'"$variant"'/; s/%%VARIANT%%/'"$variant"'/;
s/%%PHP_VERSION%%/'"$phpVersion"'/; s/%%PHP_VERSION%%/'"$phpVersion"'/;
s#%%LABEL%%#'"$label"'#; s#%%LABEL%%#'"$label"'#;
s/%%VERSION%%/'"$version"'/; s/%%VERSION%%/'"$version"'/g;
s/%%COMMIT%%/'"$commit"'/; s/%%COMMIT%%/'"$commit"'/;
s/%%CMD%%/'"${cmd[$variant]}"'/; s/%%CMD%%/'"${cmd[$variant]}"'/;
s#%%APACHE_DOCUMENT%%#'"${document[$variant]}"'#; s#%%APACHE_DOCUMENT%%#'"${document[$variant]}"'#;