diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index dc0f392..56b4098 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*.*.*' ] @@ -38,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 diff --git a/Dockerfile b/Dockerfile index d16f049..2dd6737 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,31 +19,49 @@ RUN \ glibc-static \ zlib-devel \ zlib-static \ + nettle \ + nettle-devel \ + gpgme-devel \ vim \ sudo \ + jq \ git 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} \ && 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 --assumeyes libcurl-minimal curl-minimal \ + && dnf install --assumeyes libcurl-devel + 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 -# install GHC, cabal and stack +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 \ + && rm -f /tmp/terraform.zip + +# 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} && \