Skip to content

Commit 555eb56

Browse files
joshuacherryjoshuacherry
committed
#16 - Changed inspec download method
1 parent ecb7e10 commit 555eb56

File tree

12 files changed

+172
-32
lines changed

12 files changed

+172
-32
lines changed

‎docker/centos7/Dockerfile‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@ FROM centos:7
22

33
ENV TERM=xterm
44

5-
RUN yum install -y epel-release \
5+
COPY chef.asc /tmp/chef.asc
6+
COPY chef-stable.repo /etc/yum.repos.d/chef-stable.repo
7+
8+
RUN rpm --import /tmp/chef.asc \
9+
&& yum install -y epel-release \
610
&& yum install -y \
711
ansible \
12+
inspec-1.25.0-1.el7 \
813
wget \
914
coreutils \
1015
net-tools \
1116
&& yum clean all
12-
13-
## https://downloads.chef.io/inspec/1.24.0
14-
RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/el/7/inspec-1.24.0-1.el7.x86_64.rpm \
15-
&& echo "c3b739f4262a56ad1626a4c46465a9905d3ab2d36514c4cfdc998cd2dae24f90 inspec-1.24.0-1.el7.x86_64.rpm" \
16-
| sha256sum -c \
17-
&& yum install -y inspec-1.24.0-1.el7.x86_64.rpm \
18-
&& rm inspec-1.24.0-1.el7.x86_64.rpm

‎docker/centos7/chef-stable.repo‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[chef-stable]
2+
name=chef-stable
3+
baseurl=https://packages.chef.io/repos/yum/stable/el/7/\$basearch/
4+
gpgcheck=1
5+
enabled=1

‎docker/centos7/chef.asc‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
Version: GnuPG v1.4.12 (Darwin)
3+
Comment: GPGTools - http://gpgtools.org
4+
5+
mQGiBEppC7QRBADfsOkZU6KZK+YmKw4wev5mjKJEkVGlus+NxW8wItX5sGa6kdUu
6+
twAyj7Yr92rF+ICFEP3gGU6+lGo0Nve7KxkN/1W7/m3G4zuk+ccIKmjp8KS3qn99
7+
dxy64vcji9jIllVa+XXOGIp0G8GEaj7mbkixL/bMeGfdMlv8Gf2XPpp9vwCgn/GC
8+
JKacfnw7MpLKUHOYSlb//JsEAJqao3ViNfav83jJKEkD8cf59Y8xKia5OpZqTK5W
9+
ShVnNWS3U5IVQk10ZDH97Qn/YrK387H4CyhLE9mxPXs/ul18ioiaars/q2MEKU2I
10+
XKfV21eMLO9LYd6Ny/Kqj8o5WQK2J6+NAhSwvthZcIEphcFignIuobP+B5wNFQpe
11+
DbKfA/0WvN2OwFeWRcmmd3Hz7nHTpcnSF+4QX6yHRF/5BgxkG6IqBIACQbzPn6Hm
12+
sMtm/SVf11izmDqSsQptCrOZILfLX/mE+YOl+CwWSHhl+YsFts1WOuh1EhQD26aO
13+
Z84HuHV5HFRWjDLw9LriltBVQcXbpfSrRP5bdr7Wh8vhqJTPjrQnT3BzY29kZSBQ
14+
YWNrYWdlcyA8cGFja2FnZXNAb3BzY29kZS5jb20+iGAEExECACAFAkppC7QCGwMG
15+
CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRApQKupg++Caj8sAKCOXmdG36gWji/K
16+
+o+XtBfvdMnFYQCfTCEWxRy2BnzLoBBFCjDSK6sJqCu0IENIRUYgUGFja2FnZXMg
17+
PHBhY2thZ2VzQGNoZWYuaW8+iGIEExECACIFAlQwYFECGwMGCwkIBwMCBhUIAgkK
18+
CwQWAgMBAh4BAheAAAoJEClAq6mD74JqX94An26z99XOHWpLN8ahzm7cp13t4Xid
19+
AJ9wVcgoUBzvgg91lKfv/34cmemZn7kCDQRKaQu0EAgAg7ZLCVGVTmLqBM6njZEd
20+
Zbv+mZbvwLBSomdiqddE6u3eH0X3GuwaQfQWHUVG2yedyDMiG+EMtCdEeeRebTCz
21+
SNXQ8Xvi22hRPoEsBSwWLZI8/XNg0n0f1+GEr+mOKO0BxDB2DG7DA0nnEISxwFkK
22+
OFJFebR3fRsrWjj0KjDxkhse2ddU/jVz1BY7Nf8toZmwpBmdozETMOTx3LJy1HZ/
23+
Te9FJXJMUaB2lRyluv15MVWCKQJro4MQG/7QGcIfrIZNfAGJ32DDSjV7/YO+IpRY
24+
IL4CUBQ65suY4gYUG4jhRH6u7H1p99sdwsg5OIpBe/v2Vbc/tbwAB+eJJAp89Zeu
25+
twADBQf/ZcGoPhTGFuzbkcNRSIz+boaeWPoSxK2DyfScyCAuG41CY9+g0HIw9Sq8
26+
DuxQvJ+vrEJjNvNE3EAEdKl/zkXMZDb1EXjGwDi845TxEMhhD1dDw2qpHqnJ2mtE
27+
WpZ7juGwA3sGhi6FapO04tIGacCfNNHmlRGipyq5ZiKIRq9mLEndlECr8cwaKgkS
28+
0wWu+xmMZe7N5/t/TK19HXNh4tVacv0F3fYK54GUjt2FjCQV75USnmNY4KPTYLXA
29+
dzC364hEMlXpN21siIFgB04w+TXn5UF3B4FfAy5hevvr4DtV4MvMiGLu0oWjpaLC
30+
MpmrR3Ny2wkmO0h+vgri9uIP06ODWIhJBBgRAgAJBQJKaQu0AhsMAAoJEClAq6mD
31+
74Jq4hIAoJ5KrYS8kCwj26SAGzglwggpvt3CAJ0bekyky56vNqoegB+y4PQVDv4K
32+
zA==
33+
=IxPr
34+
-----END PGP PUBLIC KEY BLOCK-----

‎docker/jessie64/Dockerfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,23 @@ FROM debian:jessie
55
# Colour output.
66
ENV TERM=xterm
77

8+
RUN apt-get update -y \
9+
&& apt-get install -y apt-transport-https software-properties-common
10+
11+
COPY chef.asc /tmp/chef.asc
12+
COPY chef-stable.list /etc/apt/sources.list.d/chef-stable.list
13+
814
RUN echo deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main >> /etc/apt/sources.list \
915
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 \
16+
&& apt-key add /tmp/chef.asc \
1017
&& apt-get update -y \
1118
&& apt-get --no-install-recommends install -y \
1219
software-properties-common \
1320
ansible \
21+
inspec=1.25.0-1 \
1422
wget \
1523
coreutils \
1624
net-tools \
1725
&& apt-get autoremove \
1826
&& apt-get clean \
1927
&& rm -rf /var/lib/apt/lists/*
20-
21-
## https://downloads.chef.io/inspec/1.24.0
22-
RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/ubuntu/14.04/inspec_1.24.0-1_amd64.deb \
23-
&& echo "33e8ab3dd4ed7eb2285310ae9d0a32e0cc45d5b6d057a29541f93870c2f9e30a inspec_1.24.0-1_amd64.deb" \
24-
| sha256sum -c \
25-
&& dpkg -i inspec_1.24.0-1_amd64.deb \
26-
&& rm inspec_1.24.0-1_amd64.deb

‎docker/jessie64/chef-stable.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deb https://packages.chef.io/repos/apt/stable jessie main

‎docker/jessie64/chef.asc‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
Version: GnuPG v1.4.12 (Darwin)
3+
Comment: GPGTools - http://gpgtools.org
4+
5+
mQGiBEppC7QRBADfsOkZU6KZK+YmKw4wev5mjKJEkVGlus+NxW8wItX5sGa6kdUu
6+
twAyj7Yr92rF+ICFEP3gGU6+lGo0Nve7KxkN/1W7/m3G4zuk+ccIKmjp8KS3qn99
7+
dxy64vcji9jIllVa+XXOGIp0G8GEaj7mbkixL/bMeGfdMlv8Gf2XPpp9vwCgn/GC
8+
JKacfnw7MpLKUHOYSlb//JsEAJqao3ViNfav83jJKEkD8cf59Y8xKia5OpZqTK5W
9+
ShVnNWS3U5IVQk10ZDH97Qn/YrK387H4CyhLE9mxPXs/ul18ioiaars/q2MEKU2I
10+
XKfV21eMLO9LYd6Ny/Kqj8o5WQK2J6+NAhSwvthZcIEphcFignIuobP+B5wNFQpe
11+
DbKfA/0WvN2OwFeWRcmmd3Hz7nHTpcnSF+4QX6yHRF/5BgxkG6IqBIACQbzPn6Hm
12+
sMtm/SVf11izmDqSsQptCrOZILfLX/mE+YOl+CwWSHhl+YsFts1WOuh1EhQD26aO
13+
Z84HuHV5HFRWjDLw9LriltBVQcXbpfSrRP5bdr7Wh8vhqJTPjrQnT3BzY29kZSBQ
14+
YWNrYWdlcyA8cGFja2FnZXNAb3BzY29kZS5jb20+iGAEExECACAFAkppC7QCGwMG
15+
CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRApQKupg++Caj8sAKCOXmdG36gWji/K
16+
+o+XtBfvdMnFYQCfTCEWxRy2BnzLoBBFCjDSK6sJqCu0IENIRUYgUGFja2FnZXMg
17+
PHBhY2thZ2VzQGNoZWYuaW8+iGIEExECACIFAlQwYFECGwMGCwkIBwMCBhUIAgkK
18+
CwQWAgMBAh4BAheAAAoJEClAq6mD74JqX94An26z99XOHWpLN8ahzm7cp13t4Xid
19+
AJ9wVcgoUBzvgg91lKfv/34cmemZn7kCDQRKaQu0EAgAg7ZLCVGVTmLqBM6njZEd
20+
Zbv+mZbvwLBSomdiqddE6u3eH0X3GuwaQfQWHUVG2yedyDMiG+EMtCdEeeRebTCz
21+
SNXQ8Xvi22hRPoEsBSwWLZI8/XNg0n0f1+GEr+mOKO0BxDB2DG7DA0nnEISxwFkK
22+
OFJFebR3fRsrWjj0KjDxkhse2ddU/jVz1BY7Nf8toZmwpBmdozETMOTx3LJy1HZ/
23+
Te9FJXJMUaB2lRyluv15MVWCKQJro4MQG/7QGcIfrIZNfAGJ32DDSjV7/YO+IpRY
24+
IL4CUBQ65suY4gYUG4jhRH6u7H1p99sdwsg5OIpBe/v2Vbc/tbwAB+eJJAp89Zeu
25+
twADBQf/ZcGoPhTGFuzbkcNRSIz+boaeWPoSxK2DyfScyCAuG41CY9+g0HIw9Sq8
26+
DuxQvJ+vrEJjNvNE3EAEdKl/zkXMZDb1EXjGwDi845TxEMhhD1dDw2qpHqnJ2mtE
27+
WpZ7juGwA3sGhi6FapO04tIGacCfNNHmlRGipyq5ZiKIRq9mLEndlECr8cwaKgkS
28+
0wWu+xmMZe7N5/t/TK19HXNh4tVacv0F3fYK54GUjt2FjCQV75USnmNY4KPTYLXA
29+
dzC364hEMlXpN21siIFgB04w+TXn5UF3B4FfAy5hevvr4DtV4MvMiGLu0oWjpaLC
30+
MpmrR3Ny2wkmO0h+vgri9uIP06ODWIhJBBgRAgAJBQJKaQu0AhsMAAoJEClAq6mD
31+
74Jq4hIAoJ5KrYS8kCwj26SAGzglwggpvt3CAJ0bekyky56vNqoegB+y4PQVDv4K
32+
zA==
33+
=IxPr
34+
-----END PGP PUBLIC KEY BLOCK-----

‎docker/trusty64/Dockerfile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,20 @@ FROM ubuntu:trusty
66
ENV TERM=xterm
77

88
RUN apt-get update -y \
9-
&& apt-get install -y software-properties-common \
9+
&& apt-get install -y apt-transport-https software-properties-common
10+
11+
COPY chef.asc /tmp/chef.asc
12+
COPY chef-stable.list /etc/apt/sources.list.d/chef-stable.list
13+
14+
RUN apt-key add /tmp/chef.asc \
1015
&& apt-add-repository ppa:ansible/ansible \
1116
&& apt-get update -y \
1217
&& apt-get --no-install-recommends install -y \
1318
ansible \
19+
inspec=1.25.0-1 \
1420
wget \
1521
coreutils \
1622
net-tools \
1723
&& apt-get autoremove \
1824
&& apt-get clean \
1925
&& rm -rf /var/lib/apt/lists/*
20-
21-
## https://downloads.chef.io/inspec/1.24.0
22-
RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/ubuntu/14.04/inspec_1.24.0-1_amd64.deb \
23-
&& echo "33e8ab3dd4ed7eb2285310ae9d0a32e0cc45d5b6d057a29541f93870c2f9e30a inspec_1.24.0-1_amd64.deb" \
24-
| sha256sum -c \
25-
&& dpkg -i inspec_1.24.0-1_amd64.deb \
26-
&& rm inspec_1.24.0-1_amd64.deb

‎docker/trusty64/chef-stable.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deb https://packages.chef.io/repos/apt/stable trusty main

‎docker/trusty64/chef.asc‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
Version: GnuPG v1.4.12 (Darwin)
3+
Comment: GPGTools - http://gpgtools.org
4+
5+
mQGiBEppC7QRBADfsOkZU6KZK+YmKw4wev5mjKJEkVGlus+NxW8wItX5sGa6kdUu
6+
twAyj7Yr92rF+ICFEP3gGU6+lGo0Nve7KxkN/1W7/m3G4zuk+ccIKmjp8KS3qn99
7+
dxy64vcji9jIllVa+XXOGIp0G8GEaj7mbkixL/bMeGfdMlv8Gf2XPpp9vwCgn/GC
8+
JKacfnw7MpLKUHOYSlb//JsEAJqao3ViNfav83jJKEkD8cf59Y8xKia5OpZqTK5W
9+
ShVnNWS3U5IVQk10ZDH97Qn/YrK387H4CyhLE9mxPXs/ul18ioiaars/q2MEKU2I
10+
XKfV21eMLO9LYd6Ny/Kqj8o5WQK2J6+NAhSwvthZcIEphcFignIuobP+B5wNFQpe
11+
DbKfA/0WvN2OwFeWRcmmd3Hz7nHTpcnSF+4QX6yHRF/5BgxkG6IqBIACQbzPn6Hm
12+
sMtm/SVf11izmDqSsQptCrOZILfLX/mE+YOl+CwWSHhl+YsFts1WOuh1EhQD26aO
13+
Z84HuHV5HFRWjDLw9LriltBVQcXbpfSrRP5bdr7Wh8vhqJTPjrQnT3BzY29kZSBQ
14+
YWNrYWdlcyA8cGFja2FnZXNAb3BzY29kZS5jb20+iGAEExECACAFAkppC7QCGwMG
15+
CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRApQKupg++Caj8sAKCOXmdG36gWji/K
16+
+o+XtBfvdMnFYQCfTCEWxRy2BnzLoBBFCjDSK6sJqCu0IENIRUYgUGFja2FnZXMg
17+
PHBhY2thZ2VzQGNoZWYuaW8+iGIEExECACIFAlQwYFECGwMGCwkIBwMCBhUIAgkK
18+
CwQWAgMBAh4BAheAAAoJEClAq6mD74JqX94An26z99XOHWpLN8ahzm7cp13t4Xid
19+
AJ9wVcgoUBzvgg91lKfv/34cmemZn7kCDQRKaQu0EAgAg7ZLCVGVTmLqBM6njZEd
20+
Zbv+mZbvwLBSomdiqddE6u3eH0X3GuwaQfQWHUVG2yedyDMiG+EMtCdEeeRebTCz
21+
SNXQ8Xvi22hRPoEsBSwWLZI8/XNg0n0f1+GEr+mOKO0BxDB2DG7DA0nnEISxwFkK
22+
OFJFebR3fRsrWjj0KjDxkhse2ddU/jVz1BY7Nf8toZmwpBmdozETMOTx3LJy1HZ/
23+
Te9FJXJMUaB2lRyluv15MVWCKQJro4MQG/7QGcIfrIZNfAGJ32DDSjV7/YO+IpRY
24+
IL4CUBQ65suY4gYUG4jhRH6u7H1p99sdwsg5OIpBe/v2Vbc/tbwAB+eJJAp89Zeu
25+
twADBQf/ZcGoPhTGFuzbkcNRSIz+boaeWPoSxK2DyfScyCAuG41CY9+g0HIw9Sq8
26+
DuxQvJ+vrEJjNvNE3EAEdKl/zkXMZDb1EXjGwDi845TxEMhhD1dDw2qpHqnJ2mtE
27+
WpZ7juGwA3sGhi6FapO04tIGacCfNNHmlRGipyq5ZiKIRq9mLEndlECr8cwaKgkS
28+
0wWu+xmMZe7N5/t/TK19HXNh4tVacv0F3fYK54GUjt2FjCQV75USnmNY4KPTYLXA
29+
dzC364hEMlXpN21siIFgB04w+TXn5UF3B4FfAy5hevvr4DtV4MvMiGLu0oWjpaLC
30+
MpmrR3Ny2wkmO0h+vgri9uIP06ODWIhJBBgRAgAJBQJKaQu0AhsMAAoJEClAq6mD
31+
74Jq4hIAoJ5KrYS8kCwj26SAGzglwggpvt3CAJ0bekyky56vNqoegB+y4PQVDv4K
32+
zA==
33+
=IxPr
34+
-----END PGP PUBLIC KEY BLOCK-----

‎docker/xenial64/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@ FROM ubuntu:xenial
66
ENV TERM=xterm
77

88
RUN apt-get update -y \
9-
&& apt-get install -y software-properties-common \
9+
&& apt-get install -y apt-transport-https software-properties-common
10+
11+
COPY chef.asc /tmp/chef.asc
12+
COPY chef-stable.list /etc/apt/sources.list.d/chef-stable.list
13+
14+
RUN apt-key add /tmp/chef.asc \
1015
&& apt-add-repository ppa:ansible/ansible \
1116
&& apt-get update -y \
1217
&& apt-get --no-install-recommends install -y \
1318
ansible \
14-
wget \
19+
inspec=1.25.0-1 \
1520
coreutils \
1621
net-tools \
1722
&& apt-get autoremove \
1823
&& apt-get clean \
1924
&& rm -rf /var/lib/apt/lists/*
20-
21-
## https://downloads.chef.io/inspec/1.24.0
22-
RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/ubuntu/16.04/inspec_1.24.0-1_amd64.deb \
23-
&& echo "33e8ab3dd4ed7eb2285310ae9d0a32e0cc45d5b6d057a29541f93870c2f9e30a inspec_1.24.0-1_amd64.deb" \
24-
| sha256sum -c \
25-
&& dpkg -i inspec_1.24.0-1_amd64.deb \
26-
&& rm inspec_1.24.0-1_amd64.deb

0 commit comments

Comments
 (0)