try to fix missing apt key

sonatype-nexus-community · Apr 26, 2022 · 1b56d7d · 1b56d7d
1 parent 6626be6
commit 1b56d7d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/docker/docker_test.go b/docker/docker_test.go
@@ -28,15 +28,14 @@ func TestDockerIntegration(t *testing.T) {
 	tests := map[string]struct {
 		expectedDockerfile string
 	}{
-		// @todo Restore dpkg tests
-		//"dpkg-query using autodetect": {expectedDockerfile: "dpkg-query-autodetect/Dockerfile"},
-		//"dpkg-query":                  {expectedDockerfile: "dpkg-query/Dockerfile"},
-		"yum":                  {expectedDockerfile: "yum/Dockerfile"},
-		"yum using autodetect": {expectedDockerfile: "yum-autodetect/Dockerfile"},
-		"dnf":                  {expectedDockerfile: "dnf/Dockerfile"},
-		"dnf using autodetect": {expectedDockerfile: "dnf-autodetect/Dockerfile"},
-		"apk using autodetect": {expectedDockerfile: "apk-autodetect/Dockerfile"},
-		"apk":                  {expectedDockerfile: "apk/Dockerfile"},
+		"dpkg-query using autodetect": {expectedDockerfile: "dpkg-query-autodetect/Dockerfile"},
+		"dpkg-query":                  {expectedDockerfile: "dpkg-query/Dockerfile"},
+		"yum":                         {expectedDockerfile: "yum/Dockerfile"},
+		"yum using autodetect":        {expectedDockerfile: "yum-autodetect/Dockerfile"},
+		"dnf":                         {expectedDockerfile: "dnf/Dockerfile"},
+		"dnf using autodetect":        {expectedDockerfile: "dnf-autodetect/Dockerfile"},
+		"apk using autodetect":        {expectedDockerfile: "apk-autodetect/Dockerfile"},
+		"apk":                         {expectedDockerfile: "apk/Dockerfile"},
 	}
 	t.Run("docker", func(t *testing.T) {
 		for name, test := range tests {

diff --git a/docker/dpkg-query-autodetect/Dockerfile b/docker/dpkg-query-autodetect/Dockerfile
@@ -2,10 +2,12 @@ FROM ubuntu:latest
 
 WORKDIR /ahab-docker
 
-RUN apt-get update && apt-get -y install python3-pip
+RUN apt-get update && apt-get -y install python3-pip sudo
 
 COPY ahab .
 
+RUN sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 871920D1991BC93C
+
 # Spit out these just for easier debugging
 RUN dpkg-query --show --showformat='${Package} ${Version}\n'
 

diff --git a/docker/dpkg-query/Dockerfile b/docker/dpkg-query/Dockerfile
@@ -2,10 +2,12 @@ FROM ubuntu:latest
 
 WORKDIR /ahab-docker
 
-RUN apt-get update && apt-get -y install python3-pip
+RUN apt-get update && apt-get -y install python3-pip sudo
 
 COPY ahab .
 
+RUN sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 871920D1991BC93C
+
 # Spit out these just for easier debugging
 RUN dpkg-query --show --showformat='${Package} ${Version}\n'