From b37639ff393a5f14c996498c2b0cbc3b8d99a196 Mon Sep 17 00:00:00 2001 From: Christophe Date: Mon, 15 Jan 2024 14:50:26 +0100 Subject: [PATCH 01/12] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index dc0f392..83f0c03 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -6,8 +6,6 @@ name: Docker # documentation. on: - schedule: - - cron: '33 23 * * *' push: # Publish server tags as releases. tags: [ 'v*.*.*' ] From 74fea9f359484b1c577f6a2d646a31aaf3a8657b Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 16 Jan 2024 10:22:04 +0100 Subject: [PATCH 02/12] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index d16f049..cf4ac00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN \ zlib-static \ vim \ sudo \ + jq \ git RUN \ From 8f7d383bfcdb57c27154abfcc398433074977966 Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 16 Jan 2024 22:26:02 +0100 Subject: [PATCH 03/12] Update Dockerfile --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cf4ac00..6a6f908 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,12 +38,17 @@ USER ${USER_NAME} WORKDIR /home/${USER_NAME} -RUN /usr/bin/curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \ +RUN /usr/bin/curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" --output "awscliv2.zip" \ && unzip awscliv2.zip \ && sudo ./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update \ && rm -fr awscliv2.zip \ && rm -fr ./aws +RUN /usr/bin/curl "https://releases.hashicorp.com/terraform/1.6.6/terraform_1.6.6_linux_amd64.zip" --output "/tmp/terraform.zip" \ + && mkdir -p /home/${USER_NAME}/.local/bin \ + && unzip /tmp/terraform.zip -d /home/${USER_NAME}/.local/bin \ + && chmod 755 /home/${USER_NAME}/.local/bin/terraform + # install GHC, cabal and stack RUN \ ghcup -v install ghc --force ${VERSION_GHC} && \ From 094d9349988c15b7170e63e6ee81526ff4d2df6c Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 16 Jan 2024 22:27:10 +0100 Subject: [PATCH 04/12] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a6f908..130b8e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,8 @@ RUN /usr/bin/curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" --o RUN /usr/bin/curl "https://releases.hashicorp.com/terraform/1.6.6/terraform_1.6.6_linux_amd64.zip" --output "/tmp/terraform.zip" \ && mkdir -p /home/${USER_NAME}/.local/bin \ && unzip /tmp/terraform.zip -d /home/${USER_NAME}/.local/bin \ - && chmod 755 /home/${USER_NAME}/.local/bin/terraform + && chmod 755 /home/${USER_NAME}/.local/bin/terraform \ + && rm -f /tmp/terraform.zip # install GHC, cabal and stack RUN \ From 852f074030681cd6666c36dd3c325ad62dcdbe4e Mon Sep 17 00:00:00 2001 From: Christophe Date: Wed, 28 Feb 2024 09:54:10 +0100 Subject: [PATCH 05/12] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 130b8e8..71449a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ RUN \ gcc \ g++ \ gmp-devel \ + libcurl-devel \ gmp-static \ glibc-static \ zlib-devel \ From c1ed35a33613f38996cbacb516e6b3fd2fac2677 Mon Sep 17 00:00:00 2001 From: Christophe Date: Wed, 28 Feb 2024 11:15:08 +0100 Subject: [PATCH 06/12] Update Dockerfile --- Dockerfile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71449a1..6549fd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,13 +9,19 @@ ARG USER_NAME=haskell ARG USER_UID=1000 ARG USER_GID=$USER_UID +# curl-minimal is too restrictive for data integration +RUN \ + microdnf install --assumeyes libssh libpsl libbrotli \ + && microdnf download curl libcurl \ + && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \ + && microdnf remove -y libcurl-minimal curl-minimal + RUN \ - dnf install --assumeyes findutils \ + microdnf install --assumeyes findutils \ cmake \ gcc \ g++ \ gmp-devel \ - libcurl-devel \ gmp-static \ glibc-static \ zlib-devel \ @@ -29,7 +35,7 @@ RUN \ /usr/bin/curl ${GHCUP_DWN_URL} > /usr/bin/ghcup && \ chmod +x /usr/bin/ghcup -# Creating the workspace user +# creating the workspace user RUN /usr/sbin/groupadd --gid ${USER_GID} ${USER_NAME} \ && /usr/sbin/useradd --uid ${USER_UID} --gid ${USER_GID} --no-log-init --create-home -m ${USER_NAME} -s /usr/bin/bash \ && /bin/echo ${USER_NAME} ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/${USER_NAME} \ @@ -51,7 +57,7 @@ RUN /usr/bin/curl "https://releases.hashicorp.com/terraform/1.6.6/terraform_1.6. && chmod 755 /home/${USER_NAME}/.local/bin/terraform \ && rm -f /tmp/terraform.zip -# install GHC, cabal and stack +# installing GHC, cabal and stack (better not use stack though) RUN \ ghcup -v install ghc --force ${VERSION_GHC} && \ ghcup -v install cabal --force ${VERSION_CABAL} && \ From 4f8c7e470c3edc6a5ed638b64764e743965fa30e Mon Sep 17 00:00:00 2001 From: Christophe Date: Wed, 28 Feb 2024 11:35:09 +0100 Subject: [PATCH 07/12] Update Dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6549fd2..dcc751e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,13 +11,13 @@ ARG USER_GID=$USER_UID # curl-minimal is too restrictive for data integration RUN \ - microdnf install --assumeyes libssh libpsl libbrotli \ - && microdnf download curl libcurl \ + dnf install --assumeyes libssh libpsl libbrotli \ + && dnf download curl libcurl \ && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \ - && microdnf remove -y libcurl-minimal curl-minimal + && dnf remove -y libcurl-minimal curl-minimal RUN \ - microdnf install --assumeyes findutils \ + dnf install --assumeyes findutils \ cmake \ gcc \ g++ \ From e6475565616e6043d6948f0dd5f48d8b8454c413 Mon Sep 17 00:00:00 2001 From: Christophe Date: Wed, 28 Feb 2024 11:48:51 +0100 Subject: [PATCH 08/12] Update Dockerfile --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index dcc751e..b65617e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,13 +9,6 @@ ARG USER_NAME=haskell ARG USER_UID=1000 ARG USER_GID=$USER_UID -# curl-minimal is too restrictive for data integration -RUN \ - dnf install --assumeyes libssh libpsl libbrotli \ - && dnf download curl libcurl \ - && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \ - && dnf remove -y libcurl-minimal curl-minimal - RUN \ dnf install --assumeyes findutils \ cmake \ @@ -41,6 +34,13 @@ RUN /usr/sbin/groupadd --gid ${USER_GID} ${USER_NAME} \ && /bin/echo ${USER_NAME} ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/${USER_NAME} \ && chmod 0440 /etc/sudoers.d/${USER_NAME} +# curl-minimal is too restrictive for data integration +RUN \ + dnf install --assumeyes libssh libpsl libbrotli \ + && dnf download curl libcurl \ + && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \ + && dnf remove -y libcurl-minimal curl-minimal + USER ${USER_NAME} WORKDIR /home/${USER_NAME} From da6ffc4794d1cef46af08eea3425279105cfc1b4 Mon Sep 17 00:00:00 2001 From: Christophe Date: Wed, 28 Feb 2024 12:15:31 +0100 Subject: [PATCH 09/12] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b65617e..17ac2db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,8 @@ RUN \ dnf install --assumeyes libssh libpsl libbrotli \ && dnf download curl libcurl \ && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \ - && dnf remove -y libcurl-minimal curl-minimal + && dnf remove --assumeyes libcurl-minimal curl-minimal \ + && dnf install --assumeyes libcurl-devel USER ${USER_NAME} From dfdaba57f198e63db7131fc7d0187e11131e5ec1 Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 26 Mar 2024 11:45:43 +0100 Subject: [PATCH 10/12] Added GPGMe devel --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 17ac2db..4f5ccc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN \ glibc-static \ zlib-devel \ zlib-static \ + gpgme-devel \ vim \ sudo \ jq \ From 5a08f0acbae642b4837223d63fc214c8e53b2942 Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 26 Mar 2024 12:11:10 +0100 Subject: [PATCH 11/12] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 83f0c03..56b4098 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -36,9 +36,9 @@ jobs: # https://github.com/sigstore/cosign-installer - name: Install cosign if: github.event_name != 'pull_request' - uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1 + uses: sigstore/cosign-installer@v3.3.0 with: - cosign-release: 'v2.1.1' + cosign-release: 'v2.2.2' # Set up BuildKit Docker container builder to be able to build # multi-platform images and export cache From f3de3eaecedb8b56b09dd07c920f7fc5439de641 Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 26 Mar 2024 14:31:57 +0100 Subject: [PATCH 12/12] Added nettle lib --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 4f5ccc1..2dd6737 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,8 @@ RUN \ glibc-static \ zlib-devel \ zlib-static \ + nettle \ + nettle-devel \ gpgme-devel \ vim \ sudo \