doc: Fix apt-key adv command with safer argument

Some users were reporting that passing the keyserver domain directly causes an error that wouldn't happen if the complete URL is passed instead: gpg: keyserver receive failed: Server indicated a failure
Kurento · Mar 22, 2023 · d61a119 · d61a119
1 parent a66a7a5
commit d61a119
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 25 deletions.
diff --git a/ci-scripts/AWS/cfn-setup.sh b/ci-scripts/AWS/cfn-setup.sh
@@ -31,7 +31,7 @@ apt-get update ; apt-get install --no-install-recommends --yes \
 
 # Add Kurento repository key for apt-get.
 apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
 # Add Kurento repository line for apt-get.

diff --git a/ci-scripts/kurento-buildpackage.sh b/ci-scripts/kurento-buildpackage.sh
@@ -301,7 +301,7 @@ if [[ "$CFG_INSTALL_KURENTO" == "true" ]]; then
         if [[ "$CFG_APT_ADD_REPO" == "true" ]]; then
             log "Add Kurento repository key for apt-get"
             apt-key adv \
-                --keyserver keyserver.ubuntu.com \
+                --keyserver hkp://keyserver.ubuntu.com:80 \
                 --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
             log "Add Kurento repository line for apt-get"
@@ -315,7 +315,7 @@ if [[ "$CFG_INSTALL_KURENTO" == "true" ]]; then
             log "Suggested solution 2:"
             log "    Run commands:"
             log "    $ apt-key adv \\"
-            log "        --keyserver keyserver.ubuntu.com \\"
+            log "        --keyserver hkp://keyserver.ubuntu.com:80 \\"
             log "        --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83"
             log "    $ echo '$LIST_LINE' | sudo tee -a /etc/apt/sources.list.d/kurento.list"
             log ""

diff --git a/ci-scripts/kurento_ci_job_deploy_debian_test.sh b/ci-scripts/kurento_ci_job_deploy_debian_test.sh
@@ -132,7 +132,7 @@ apt-get update ; apt-get install --no-install-recommends --yes \
 
 # Add Kurento repository key for apt-get.
 apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
 # Add Kurento repository line for apt-get.
@@ -156,7 +156,7 @@ echo "# Install debug symbols"
 # Add Ubuntu debug repository key for apt-get.
 apt-get update ; apt-get install --yes ubuntu-dbgsym-keyring \
 || apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys F2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622
 
 # Add Ubuntu debug repository line for apt-get.

diff --git a/ci-scripts/kurento_install_server.sh b/ci-scripts/kurento_install_server.sh
@@ -76,7 +76,7 @@ source /etc/upstream-release/lsb-release 2>/dev/null || source /etc/lsb-release
 apt-get update ; apt-get install --no-install-recommends --yes \
     gnupg
 apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
 # Add Kurento repository line for apt-get.

diff --git a/ci-scripts/kurento_maven_deploy.sh b/ci-scripts/kurento_maven_deploy.sh
@@ -162,17 +162,22 @@ PROJECT_VERSION="$(kurento_get_version.sh "${GET_VERSION_ARGS[@]}")" || {
 
 log "Build and deploy version: $PROJECT_VERSION"
 
-# If SNAPSHOT, deploy to snapshots repository and exit.
-if [[ $PROJECT_VERSION == *-SNAPSHOT ]]; then
-    log "Version to deploy is SNAPSHOT"
-
+# Always deploy to snapshots repository.
+# Having all versions (snapshot or not) in the snapshots repository can be handy
+# for development when trying to test a release version but not wanting to wait
+# until Maven Central makes the published packages available (which can take
+# 30 or more minutes).
+{
     MVN_ARGS+=(-Psnapshot)
 
     source kurento_maven_deploy_github.sh || {
         log "ERROR: Command failed: kurento_maven_deploy_github"
         exit 1
     }
+}
 
+if [[ $PROJECT_VERSION == *-SNAPSHOT ]]; then
+    log "Version to deploy is SNAPSHOT"
     exit 0
 fi
 

diff --git a/doc-kurento/source/dev/dev_guide.rst b/doc-kurento/source/dev/dev_guide.rst
@@ -293,7 +293,7 @@ After having :doc:`installed Kurento </user/installation>`, first thing to do is
    # Add Ubuntu debug repository key for apt-get.
    apt-get update ; apt-get install --yes ubuntu-dbgsym-keyring \
    || apt-key adv \
-      --keyserver keyserver.ubuntu.com \
+      --keyserver hkp://keyserver.ubuntu.com:80 \
       --recv-keys F2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622
 
    # Add Ubuntu debug repository line for apt-get.

diff --git a/doc-kurento/source/project/relnotes/v6_10_0.rst b/doc-kurento/source/project/relnotes/v6_10_0.rst
@@ -20,7 +20,7 @@ To install KMS on this version of Ubuntu, just follow the usual :doc:`installati
    DISTRO="bionic"  # KMS for Ubuntu 18.04 (Bionic)
 
    sudo apt-key adv \
-       --keyserver keyserver.ubuntu.com \
+       --keyserver hkp://keyserver.ubuntu.com:80 \
        --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
    sudo tee "/etc/apt/sources.list.d/kurento.list" >/dev/null <<EOF

diff --git a/doc-kurento/source/user/installation.rst b/doc-kurento/source/user/installation.rst
@@ -178,7 +178,7 @@ Open a terminal and run these commands:
 
       # Add Kurento repository key for apt-get.
       sudo apt-key adv \
-          --keyserver keyserver.ubuntu.com \
+          --keyserver hkp://keyserver.ubuntu.com:80 \
           --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
       # Add Kurento repository line for apt-get.

diff --git a/doc-kurento/source/user/installation_dev.rst b/doc-kurento/source/user/installation_dev.rst
@@ -57,7 +57,7 @@ Open a terminal and run these commands:
 
       # Add Kurento repository key for apt-get.
       sudo apt-key adv \
-          --keyserver keyserver.ubuntu.com \
+          --keyserver hkp://keyserver.ubuntu.com:80 \
           --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
       # Add Kurento repository line for apt-get.

diff --git a/docker/dev-documentation/jdk-8/Dockerfile b/docker/dev-documentation/jdk-8/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update \
 # Default to UTF-8 file.encoding
 ENV LANG C.UTF-8
 
-RUN gpg --keyserver keyserver.ubuntu.com --recv EB9B1D8886F44E2A \
+RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv EB9B1D8886F44E2A \
 	&& gpg --export --armor EB9B1D8886F44E2A | apt-key add - \
 	&& echo 'deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu xenial main ' > /etc/apt/sources.list.d/openjdk-8.list \
   && apt-get update \

diff --git a/docker/dev-integration-browser/Dockerfile b/docker/dev-integration-browser/Dockerfile
@@ -22,7 +22,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
 #=========
 # Firefox
 #=========
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AF316E81A155146718A6FBD7A6DCF7707EBC211F  \
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AF316E81A155146718A6FBD7A6DCF7707EBC211F  \
   && echo "deb http://ppa.launchpad.net/ubuntu-mozilla-security/ppa/ubuntu trusty main" >> /etc/apt/sources.list.d/firefox.list \
   && apt-get update -qqy \
   && apt-get -qqy --no-install-recommends install \

diff --git a/docker/kurento-buildpackage/Dockerfile b/docker/kurento-buildpackage/Dockerfile
@@ -106,7 +106,7 @@ RUN \
 apt-get $APT_ARGS update && apt-get $APT_ARGS install --no-install-recommends --yes \
     ubuntu-dbgsym-keyring \
 || apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys F2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622 \
 && rm -rf /var/lib/apt/lists/*
 

diff --git a/docker/kurento-media-server-asan/Dockerfile b/docker/kurento-media-server-asan/Dockerfile
@@ -110,7 +110,7 @@ apt-get $APT_ARGS update && apt-get $APT_ARGS install --no-install-recommends --
 
 # Add Kurento Apt package repository.
 RUN \
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83 \
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83 \
 && echo "deb [arch=amd64] http://ubuntu.openvidu.io/${KMS_VERSION} ${UBUNTU_CODENAME} main" >/etc/apt/sources.list.d/kurento.list
 
 # Install development tools.
@@ -127,7 +127,7 @@ apt-get $APT_ARGS update && apt-get $APT_ARGS install --no-install-recommends --
 RUN \
 echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $UBUNTU_CODENAME main" \
     >/etc/apt/sources.list.d/ubuntu-toolchain.list \
-&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA9EF27F \
+&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BA9EF27F \
 && apt-get $APT_ARGS update && apt-get $APT_ARGS install --no-install-recommends --yes \
     "gcc-${GCC_VERSION}" \
     "g++-${GCC_VERSION}" \
@@ -163,7 +163,7 @@ apt-get $APT_ARGS update && apt-get $APT_ARGS install --no-install-recommends --
     gnupg \
 && echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $UBUNTU_CODENAME main" \
     >/etc/apt/sources.list.d/ubuntu-toolchain.list \
-&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA9EF27F \
+&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BA9EF27F \
 && apt-get $APT_ARGS update && apt-get $APT_ARGS install --no-install-recommends --yes \
     libgcc1 \
     libstdc++6 \

diff --git a/docker/kurento-media-server/Dockerfile b/docker/kurento-media-server/Dockerfile
@@ -107,7 +107,7 @@ apt-get $APT_ARGS update && apt-get $APT_ARGS install --no-install-recommends --
 # Add Kurento repository key for apt-get.
 RUN \
 apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
 # Add Kurento repository line for apt-get.
@@ -153,7 +153,7 @@ RUN \
 apt-get $APT_ARGS update && apt-get $APT_ARGS install --no-install-recommends --yes \
     ubuntu-dbgsym-keyring \
 || apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys F2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622 \
 && rm -rf /var/lib/apt/lists/*
 

diff --git a/server/bin/make-dev-container.sh b/server/bin/make-dev-container.sh
@@ -261,7 +261,7 @@ apt-get update ; apt-get install --no-install-recommends --yes \
     gnupg
 
 apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
 if [[ "$DISTRIB_RELEASE" == "20.04" ]]; then
@@ -307,7 +307,7 @@ apt-get update ; apt-get install --no-install-recommends --yes \
 # Add Ubuntu debug repository key for apt-get.
 apt-get update ; apt-get install --yes ubuntu-dbgsym-keyring \
 || apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys F2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622
 
 # Add Ubuntu debug repository line for apt-get.

diff --git a/server/module-examples/markerdetector/README.txt b/server/module-examples/markerdetector/README.txt
@@ -160,7 +160,7 @@ Make sure you have the kurento development repository:
 ```
 # Import the Kurento repository signing key
 sudo apt-key adv \
-    --keyserver keyserver.ubuntu.com \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
     --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83
 
 # Get Ubuntu version definitions