From ada6a26888d125b18ed43a84743a233c62bbd2f4 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 28 Dec 2020 00:41:03 +0100 Subject: [PATCH 1/4] Update Dockerfile Refactored Dockerfile --- INSTALL.d/Dockerfile | 102 +++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 56 deletions(-) diff --git a/INSTALL.d/Dockerfile b/INSTALL.d/Dockerfile index 675c32e..9306a12 100644 --- a/INSTALL.d/Dockerfile +++ b/INSTALL.d/Dockerfile @@ -1,81 +1,72 @@ ## Dockerfile for building a docker imapsync image -# $Id: Dockerfile,v 1.28 2019/12/02 13:19:41 gilles Exp gilles $ +# $Id: Dockerfile,v 1.30 2020/03/26 07:15:04 gilles Exp gilles $ # I use the following command to build the image: # -# docker build -t gilleslamiral/imapsync . +# docker build -t gilleslamiral/imapsync . # # where this Dockerfile is in the current directory -# +# +# I thank you very much # I like thanks # I like stars # I also like (and need) money -# I thank you very much -# Number of imapsync images pulled so far (2019_12_02): 32732 +# Number of imapsync images pulled so far (2020_03_26): 84354 # Command used: # curl -s https://hub.docker.com/v2/repositories/gilleslamiral/imapsync/ | jq '.pull_count' +# Ubuntu latest points to current LTS release -FROM debian:buster +FROM ubuntu:latest LABEL maintainer="Gilles LAMIRAL " \ description="Imapsync" \ documentation="https://imapsync.lamiral.info/#doc" -# Put a copy of the Dockerfile in the image itself -# It can help future maintenance, isn't it? - -COPY Dockerfile / - -# Also put my local imapsync on /usr/bin/ for testing purpose -# renamed imapsync_local since would be erased by the wget - -COPY imapsync /usr/bin/imapsync_local -COPY prerequisites_imapsync /usr/bin/prerequisites_imapsync_local - -RUN set -xe && \ - apt-get update \ - && apt-get install -y \ - libauthen-ntlm-perl \ - libcgi-pm-perl \ - libcrypt-openssl-rsa-perl \ - libdata-uniqid-perl \ - libencode-imaputf7-perl \ +RUN apt-get update && \ + apt-get install -y \ + libauthen-ntlm-perl \ + libclass-load-perl \ + libcrypt-ssleay-perl \ + libdata-uniqid-perl \ + libdigest-hmac-perl \ + libdist-checkconflicts-perl \ + libencode-imaputf7-perl \ libfile-copy-recursive-perl \ - libfile-tail-perl \ - libio-socket-ssl-perl \ + libfile-tail-perl \ + libio-compress-perl \ libio-socket-inet6-perl \ - libio-tee-perl \ - libhtml-parser-perl \ - libjson-webtoken-perl \ + libio-socket-ssl-perl \ + libio-tee-perl \ + libjson-webtoken-perl \ libmail-imapclient-perl \ - libparse-recdescent-perl \ libmodule-scandeps-perl \ - libpar-packer-perl \ - libreadonly-perl \ - libregexp-common-perl \ - libsys-meminfo-perl \ - libterm-readkey-perl \ + libnet-dbus-perl \ + libnet-ssleay-perl \ + libpar-packer-perl \ + libreadonly-perl \ + libregexp-common-perl \ + libsys-meminfo-perl \ + libterm-readkey-perl \ + libtest-fatal-perl \ + libtest-mock-guard-perl \ libtest-mockobject-perl \ - libtest-pod-perl \ - libunicode-string-perl \ - liburi-perl \ - libwww-perl \ - procps \ - wget \ - make \ - cpanminus \ - lsof \ - && rm -rf /var/lib/apt/lists/* - -RUN set -xe \ - && pwd \ - && wget -N https://imapsync.lamiral.info/imapsync \ - https://imapsync.lamiral.info/prerequisites_imapsync \ - && mv imapsync /usr/bin/imapsync \ - && chmod +x /usr/bin/imapsync /usr/bin/imapsync_local # just_a_comment_to_force_update 2019_11_26_12_58_34 + libtest-pod-perl \ + libtest-requires-perl \ + libtest-simple-perl \ + libunicode-string-perl \ + liburi-perl \ + libtest-nowarnings-perl \ + libtest-deep-perl \ + libtest-warn-perl \ + make \ + cpanminus \ + wget +RUN wget -N https://imapsync.lamiral.info/imapsync && \ + mv imapsync /usr/bin/imapsync && \ + chmod +x /usr/bin/imapsync USER nobody:nogroup @@ -87,6 +78,5 @@ STOPSIGNAL SIGINT CMD ["/usr/bin/imapsync"] -# -# End of imapsync Dockerfile - +# +# End of imapsync Dockerfile From 542d5057ea286228cad3537b36c86ad4de7030f6 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 28 Dec 2020 00:44:07 +0100 Subject: [PATCH 2/4] Update Dockerfile Readded `set -xe` --- INSTALL.d/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/INSTALL.d/Dockerfile b/INSTALL.d/Dockerfile index 9306a12..9b0ec76 100644 --- a/INSTALL.d/Dockerfile +++ b/INSTALL.d/Dockerfile @@ -24,7 +24,8 @@ LABEL maintainer="Gilles LAMIRAL " \ description="Imapsync" \ documentation="https://imapsync.lamiral.info/#doc" -RUN apt-get update && \ +RUN set -xe && \ + apt-get update && \ apt-get install -y \ libauthen-ntlm-perl \ libclass-load-perl \ From a003ac439984adec026953ab5e80eb7ca78a4c2a Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 28 Dec 2020 09:50:43 +0100 Subject: [PATCH 3/4] Update Dockerfile Reverted back to Debian Buster --- INSTALL.d/Dockerfile | 75 ++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 41 deletions(-) diff --git a/INSTALL.d/Dockerfile b/INSTALL.d/Dockerfile index 9b0ec76..060792e 100644 --- a/INSTALL.d/Dockerfile +++ b/INSTALL.d/Dockerfile @@ -18,55 +18,48 @@ # Ubuntu latest points to current LTS release -FROM ubuntu:latest +FROM debian:buster LABEL maintainer="Gilles LAMIRAL " \ description="Imapsync" \ documentation="https://imapsync.lamiral.info/#doc" -RUN set -xe && \ - apt-get update && \ - apt-get install -y \ - libauthen-ntlm-perl \ - libclass-load-perl \ - libcrypt-ssleay-perl \ - libdata-uniqid-perl \ - libdigest-hmac-perl \ - libdist-checkconflicts-perl \ - libencode-imaputf7-perl \ - libfile-copy-recursive-perl \ - libfile-tail-perl \ - libio-compress-perl \ - libio-socket-inet6-perl \ - libio-socket-ssl-perl \ - libio-tee-perl \ - libjson-webtoken-perl \ - libmail-imapclient-perl \ - libmodule-scandeps-perl \ - libnet-dbus-perl \ - libnet-ssleay-perl \ - libpar-packer-perl \ - libreadonly-perl \ - libregexp-common-perl \ - libsys-meminfo-perl \ - libterm-readkey-perl \ - libtest-fatal-perl \ - libtest-mock-guard-perl \ - libtest-mockobject-perl \ - libtest-pod-perl \ - libtest-requires-perl \ - libtest-simple-perl \ - libunicode-string-perl \ - liburi-perl \ - libtest-nowarnings-perl \ - libtest-deep-perl \ - libtest-warn-perl \ - make \ - cpanminus \ +RUN set -xe && \ + apt-get update && \ + apt-get install -y \ + libauthen-ntlm-perl \ + libcgi-pm-perl \ + libcrypt-openssl-rsa-perl \ + libdata-uniqid-perl \ + libencode-imaputf7-perl \ + libfile-copy-recursive-perl \ + libfile-tail-perl \ + libio-socket-inet6-perl \ + libio-socket-ssl-perl \ + libio-tee-perl \ + libhtml-parser-perl \ + libjson-webtoken-perl \ + libmail-imapclient-perl \ + libparse-recdescent-perl \ + libmodule-scandeps-perl \ + libreadonly-perl \ + libregexp-common-perl \ + libsys-meminfo-perl \ + libterm-readkey-perl \ + libtest-mockobject-perl \ + libtest-pod-perl \ + libunicode-string-perl \ + liburi-perl \ + libwww-perl \ + libtest-nowarnings-perl \ + libtest-deep-perl \ + libtest-warn-perl \ + make \ + cpanminus \ wget RUN wget -N https://imapsync.lamiral.info/imapsync && \ - mv imapsync /usr/bin/imapsync && \ + mv imapsync /usr/bin/imapsync && \ chmod +x /usr/bin/imapsync USER nobody:nogroup From 89a2eee5696435b175b5243dc79f86bb6164611e Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 28 Dec 2020 12:26:21 +0100 Subject: [PATCH 4/4] Create docker-image.yml --- .github/workflows/docker-image.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..266031e --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,21 @@ +name: Docker Image CI + +on: + push: + branches: [master] + pull_request: + branches: [master] + +jobs: + buildx: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + - name: Available platforms + run: echo ${{ steps.buildx.outputs.platforms }}