[glib-networking/mcatanzaro/#140: 4/4] ci: stop hacking the crypto policy
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/mcatanzaro/#140: 4/4] ci: stop hacking the crypto policy
- Date: Wed, 14 Oct 2020 13:42:06 +0000 (UTC)
commit 88707ad2558c11be172a963b4f1035ea3ddc3e4f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Mon Oct 12 13:08:24 2020 -0500
ci: stop hacking the crypto policy
We no longer need to allow legacy crypto.
.gitlab-ci.yml | 2 +-
.gitlab-ci/Dockerfile | 2 --
.gitlab-ci/run-docker.sh | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a48908ec..8f721c7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib-networking/master:v14
+image: registry.gitlab.gnome.org/gnome/glib-networking/master:v16
fedora-x86_64:
stage: build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 8c14a2cf..16a83d97 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -4,7 +4,6 @@ RUN dnf update -y \
&& dnf install -y 'dnf-command(builddep)' \
&& dnf builddep -y glib-networking \
&& dnf install -y clang-analyzer \
- crypto-policies-scripts \
libasan \
openssl-devel \
&& dnf clean all
@@ -12,7 +11,6 @@ RUN dnf update -y \
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-RUN update-crypto-policies --set DEFAULT:FEDORA32
USER user
WORKDIR /home/user
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 117f344a..df24c9c2 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v14"
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v16"
cd "$(dirname "$0")"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]