scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-01 02:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Process code review remarks

Browse Source 
- Moved run to bottom of Dockerfile to allow using unmodified / cached states.
- Simplified bash code in deploy.sh.
- Improved the large bash one-liner in CI.yml. It could not handle >9 for 1.x.
This commit is contained in:
Dimitri Huisman
2021-11-18 17:21:56 +00:00
parent 56dd70cf4a
commit f7677543c6
17 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/CI.yml vendored
View File

@@ -27,8 +27,8 @@ on:
# Code block that is used as one liner. # Code block that is used as one liner.
##!/bin/bash ##!/bin/bash
#version=$( git tag --list "{{ env.MAILU_VERSION }}.*" | tail -1 ) #version=$( git tag --list "{{ env.MAILU_VERSION }}.*" | tail -1 )
#root_version=${version:0:3} #root_version=${version%.*}
#patch_version=${version:4:4} #patch_version=${version##*.}
#if [ "$patch_version" == "" ] #if [ "$patch_version" == "" ]
#then #then
# pinned_version={{ env.MAILU_VERSION }}.0 # pinned_version={{ env.MAILU_VERSION }}.0
@@ -73,7 +73,7 @@ jobs:
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'staging' && env.BRANCH != 'master' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'staging' && env.BRANCH != 'master' }}
shell: bash shell: bash
run: | run: |
version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version:0:3};patch_version=${version:4:4};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version%.*};patch_version=${version##*.};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV
- name: Derive PINNED_MAILU_VERSION for staging - name: Derive PINNED_MAILU_VERSION for staging
if: ${{ env.BRANCH == 'staging' }} if: ${{ env.BRANCH == 'staging' }}
shell: bash shell: bash
@@ -149,7 +149,7 @@ jobs:
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }}
shell: bash shell: bash
run: | run: |
version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version:0:3};patch_version=${version:4:4};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version%.*};patch_version=${version##*.};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV
- name: Derive PINNED_MAILU_VERSION for staging - name: Derive PINNED_MAILU_VERSION for staging
if: ${{ env.BRANCH == 'staging' }} if: ${{ env.BRANCH == 'staging' }}
shell: bash shell: bash
@@ -221,7 +221,7 @@ jobs:
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }}
shell: bash shell: bash
run: | run: |
version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version:0:3};patch_version=${version:4:4};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version%.*};patch_version=${version##*.};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV
- name: Derive PINNED_MAILU_VERSION for staging - name: Derive PINNED_MAILU_VERSION for staging
if: ${{ env.BRANCH == 'staging' }} if: ${{ env.BRANCH == 'staging' }}
shell: bash shell: bash
@@ -293,7 +293,7 @@ jobs:
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }}
shell: bash shell: bash
run: | run: |
version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version:0:3};patch_version=${version:4:4};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version%.*};patch_version=${version##*.};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV
- name: Derive PINNED_MAILU_VERSION for staging - name: Derive PINNED_MAILU_VERSION for staging
if: ${{ env.BRANCH == 'staging' }} if: ${{ env.BRANCH == 'staging' }}
shell: bash shell: bash
@@ -365,7 +365,7 @@ jobs:
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }}
shell: bash shell: bash
run: | run: |
version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version:0:3};patch_version=${version:4:4};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version%.*};patch_version=${version##*.};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV
- name: Derive PINNED_MAILU_VERSION for staging - name: Derive PINNED_MAILU_VERSION for staging
if: ${{ env.BRANCH == 'staging' }} if: ${{ env.BRANCH == 'staging' }}
shell: bash shell: bash
@@ -437,7 +437,7 @@ jobs:
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }}
shell: bash shell: bash
run: | run: |
version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version:0:3};patch_version=${version:4:4};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version%.*};patch_version=${version##*.};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV
- name: Derive PINNED_MAILU_VERSION for staging - name: Derive PINNED_MAILU_VERSION for staging
if: ${{ env.BRANCH == 'staging' }} if: ${{ env.BRANCH == 'staging' }}
shell: bash shell: bash
@@ -509,7 +509,7 @@ jobs:
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }}
shell: bash shell: bash
run: | run: |
version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version:0:3};patch_version=${version:4:4};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version%.*};patch_version=${version##*.};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV
- name: Derive PINNED_MAILU_VERSION for staging - name: Derive PINNED_MAILU_VERSION for staging
if: ${{ env.BRANCH == 'staging' }} if: ${{ env.BRANCH == 'staging' }}
shell: bash shell: bash
@@ -587,7 +587,7 @@ jobs:
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'master' }}
shell: bash shell: bash
run: | run: |
version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version:0:3};patch_version=${version:4:4};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version%.*};patch_version=${version##*.};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV
- name: Derive PINNED_MAILU_VERSION for staging - name: Derive PINNED_MAILU_VERSION for staging
if: ${{ env.BRANCH == 'staging' }} if: ${{ env.BRANCH == 'staging' }}
shell: bash shell: bash
@@ -649,7 +649,7 @@ jobs:
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'staging' && env.BRANCH != 'master' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'staging' && env.BRANCH != 'master' }}
shell: bash shell: bash
run: | run: |
version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version:0:3};patch_version=${version:4:4};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV version=$( git tag --list "${{ env.MAILU_VERSION }}.*" | tail -1 );root_version=${version%.*};patch_version=${version##*.};if [ "$patch_version" == "" ]; then pinned_version=${{ env.MAILU_VERSION }}.0; else pinned_version=$root_version.$(expr $patch_version + 1); fi;echo "PINNED_MAILU_VERSION=$pinned_version" >> $GITHUB_ENV
- name: Tag and create release - name: Tag and create release
if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'staging' && env.BRANCH != 'master' && env.PINNED_MAILU_VERSION != '' }} if: ${{ env.BRANCH != 'testing' && env.BRANCH != 'staging' && env.BRANCH != 'master' && env.PINNED_MAILU_VERSION != '' }}
uses: ncipollo/release-action@v1 uses: ncipollo/release-action@v1

2
core/admin/Dockerfile
View File

@@ -27,7 +27,6 @@ COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/qemu-arm
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN set -eu \ RUN set -eu \
@@ -60,3 +59,4 @@ ENV FLASK_APP mailu
CMD /start.py CMD /start.py
HEALTHCHECK CMD curl -f -L http://localhost/sso/login?next=ui.index || exit 1 HEALTHCHECK CMD curl -f -L http://localhost/sso/login?next=ui.index || exit 1
RUN echo $VERSION >> /version

2
core/dovecot/Dockerfile
View File

@@ -15,7 +15,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -44,3 +43,4 @@ VOLUME ["/mail"]
CMD /start.py CMD /start.py
HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 110|grep "Dovecot ready." HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 110|grep "Dovecot ready."
RUN echo $VERSION >> /version

2
core/nginx/Dockerfile
View File

@@ -5,7 +5,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -32,3 +31,4 @@ VOLUME ["/overrides"]
CMD /start.py CMD /start.py
HEALTHCHECK CMD curl -k -f -L http://localhost/health || exit 1 HEALTHCHECK CMD curl -k -f -L http://localhost/health || exit 1
RUN echo $VERSION >> /version

2
core/postfix/Dockerfile
View File

@@ -6,7 +6,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -35,3 +34,4 @@ VOLUME ["/queue"]
CMD /start.py CMD /start.py
HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 25|grep "220 .* ESMTP Postfix" HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 25|grep "220 .* ESMTP Postfix"
RUN echo $VERSION >> /version

2
core/rspamd/Dockerfile
View File

@@ -4,7 +4,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -29,3 +28,4 @@ VOLUME ["/var/lib/rspamd"]
CMD /start.py CMD /start.py
HEALTHCHECK --start-period=350s CMD curl -f -L http://localhost:11334/ || exit 1 HEALTHCHECK --start-period=350s CMD curl -f -L http://localhost:11334/ || exit 1
RUN echo $VERSION >> /version

2
docs/Dockerfile
View File

@@ -23,7 +23,6 @@ ARG pinned_version=master
ENV VERSION=$version ENV VERSION=$version
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $pinned_version >> /version
COPY ./nginx.conf /etc/nginx/conf.d/default.conf COPY ./nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=build /build/$VERSION /build/$VERSION COPY --from=build /build/$VERSION /build/$VERSION
@@ -31,3 +30,4 @@ COPY --from=build /build/$VERSION /build/$VERSION
EXPOSE 80/tcp EXPOSE 80/tcp
CMD nginx -g "daemon off;" CMD nginx -g "daemon off;"
RUN echo $pinned_version >> /version

2
optional/clamav/Dockerfile
View File

@@ -5,7 +5,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -24,3 +23,4 @@ VOLUME ["/data"]
CMD /start.py CMD /start.py
HEALTHCHECK --start-period=350s CMD /health.sh HEALTHCHECK --start-period=350s CMD /health.sh
RUN echo $VERSION >> /version

2
optional/fetchmail/Dockerfile
View File

@@ -5,7 +5,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -21,3 +20,4 @@ RUN mkdir -p /data
COPY fetchmail.py /fetchmail.py COPY fetchmail.py /fetchmail.py
CMD ["/fetchmail.py"] CMD ["/fetchmail.py"]
RUN echo $VERSION >> /version

2
optional/postgresql/Dockerfile
View File

@@ -5,7 +5,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -41,3 +40,4 @@ EXPOSE 5432
CMD /start.py CMD /start.py
HEALTHCHECK CMD psql -h 127.0.0.1 -d postgres -U health -c "select 1 as ok;" || exit 1 HEALTHCHECK CMD psql -h 127.0.0.1 -d postgres -U health -c "select 1 as ok;" || exit 1
RUN echo $VERSION >> /version

2
optional/radicale/Dockerfile
View File

@@ -5,7 +5,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -25,3 +24,4 @@ VOLUME ["/data"]
CMD radicale -S -C /radicale.conf CMD radicale -S -C /radicale.conf
HEALTHCHECK CMD curl -f -L http://localhost:5232/ || exit 1 HEALTHCHECK CMD curl -f -L http://localhost:5232/ || exit 1
RUN echo $VERSION >> /version

2
optional/traefik-certdumper/Dockerfile
View File

@@ -4,7 +4,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
RUN apk --no-cache add inotify-tools util-linux bash tzdata RUN apk --no-cache add inotify-tools util-linux bash tzdata
@@ -14,3 +13,4 @@ VOLUME ["/traefik"]
VOLUME ["/output"] VOLUME ["/output"]
ENTRYPOINT ["/run.sh"] ENTRYPOINT ["/run.sh"]
RUN echo $VERSION >> /version

2
optional/unbound/Dockerfile
View File

@@ -5,7 +5,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# python3 shared with most images # python3 shared with most images
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -31,3 +30,4 @@ EXPOSE 53/udp 53/tcp
CMD /start.py CMD /start.py
HEALTHCHECK CMD dig @127.0.0.1 || exit 1 HEALTHCHECK CMD dig @127.0.0.1 || exit 1
RUN echo $VERSION >> /version

3
setup/Dockerfile
View File

@@ -3,7 +3,7 @@ FROM $DISTRO
ARG VERSION ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
RUN mkdir -p /app RUN mkdir -p /app
WORKDIR /app WORKDIR /app
@@ -21,3 +21,4 @@ COPY static ./static
EXPOSE 80/tcp EXPOSE 80/tcp
CMD gunicorn -w 4 -b :80 --access-logfile - --error-logfile - --preload main:app CMD gunicorn -w 4 -b :80 --access-logfile - --error-logfile - --preload main:app
RUN echo $VERSION >> /version

4
tests/deploy.sh
View File

@@ -17,7 +17,7 @@ fi
#After that, both tags are pushed to the docker repository. #After that, both tags are pushed to the docker repository.
if [ "$PINNED_MAILU_VERSION" != "" ] && [ "$BRANCH" != "master" ] if [ "$PINNED_MAILU_VERSION" != "" ] && [ "$BRANCH" != "master" ]
then then
images=$(docker-compose -f tests/build.yml config | grep 'image: ' | awk -F ':' '{ print $2 }') images=$(docker-compose -f Mailu/tests/build.yml config | awk -F ':' '/image:/{ print $2 }')
for image in $images for image in $images
do do
docker tag "${image}":"${PINNED_MAILU_VERSION}" "${image}":${MAILU_VERSION} docker tag "${image}":"${PINNED_MAILU_VERSION}" "${image}":${MAILU_VERSION}
@@ -36,7 +36,7 @@ fi
#Then we publish the images with tag master #Then we publish the images with tag master
if [ "$PINNED_MAILU_VERSION" != "" ] && [ "$BRANCH" == "master" ] if [ "$PINNED_MAILU_VERSION" != "" ] && [ "$BRANCH" == "master" ]
then then
images=$(docker-compose -f tests/build.yml config | grep 'image: ' | awk -F ':' '{ print $2 }') images=$(docker-compose -f Mailu/tests/build.yml config | awk -F ':' '/image:/{ print $2 }')
for image in $images for image in $images
do do
docker tag "${image}":"${PINNED_MAILU_VERSION}" "${image}":${MAILU_VERSION} docker tag "${image}":"${PINNED_MAILU_VERSION}" "${image}":${MAILU_VERSION}

2
webmails/rainloop/Dockerfile
View File

@@ -8,7 +8,6 @@ ONBUILD COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
# Shared later between dovecot postfix nginx rspamd rainloop and roundloop # Shared later between dovecot postfix nginx rspamd rainloop and roundloop
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -75,3 +74,4 @@ VOLUME ["/data"]
CMD php-fpm7 && /start.py CMD php-fpm7 && /start.py
HEALTHCHECK CMD curl -f -L http://localhost/ || exit 1 HEALTHCHECK CMD curl -f -L http://localhost/ || exit 1
RUN echo $VERSION >> /version

2
webmails/roundcube/Dockerfile
View File

@@ -11,7 +11,6 @@ ARG VERSION
ENV TZ Etc/UTC ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
RUN echo $VERSION >> /version
#Shared layer between rainloop and roundcube #Shared layer between rainloop and roundcube
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
@@ -62,3 +61,4 @@ VOLUME ["/data"]
CMD /start.py CMD /start.py
HEALTHCHECK CMD curl -f -L -H 'User-Agent: health' http://localhost/ || exit 1 HEALTHCHECK CMD curl -f -L -H 'User-Agent: health' http://localhost/ || exit 1
RUN echo $VERSION >> /version