Skip to content

Commit 3a519ca

Browse files
aarranzaarranz
authored
Merge pull request #20 from aarranz/feature/use-apt-gosu
Use gosu from apt to fix validation problems installing it
2 parents cb7b9db + a91c273 commit 3a519ca

4 files changed

Lines changed: 4 additions & 64 deletions

File tree

‎1.0-composable/Dockerfile‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,9 @@ MAINTAINER WireCloud Team <wirecloud@conwet.com>
55
WORKDIR /opt
66

77
RUN apt update && \
8-
apt install -y libmemcached-dev && \
8+
apt install -y libmemcached-dev gosu && \
99
pip install --no-cache-dir "python-social-auth<0.3,>=0.2.2" "gunicorn==19.3.0" "psycopg2==2.6" pylibmc && \
1010
rm -rf /var/lib/apt/lists/* && \
11-
\
12-
export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \
13-
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" && \
14-
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" && \
15-
export GNUPGHOME="$(mktemp -d)" && \
16-
for server in $(shuf -e ha.pool.sks-keyservers.net \
17-
hkp://p80.pool.sks-keyservers.net:80 \
18-
keyserver.ubuntu.com \
19-
hkp://keyserver.ubuntu.com:80 \
20-
pgp.mit.edu) ; do \
21-
gpg --batch --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \
22-
done && \
23-
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
24-
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc && \
25-
chmod +x /usr/local/bin/gosu && \
2611
gosu nobody true
2712

2813
RUN pip install --no-cache-dir "wirecloud<1.1"

‎1.1-composable/Dockerfile‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,9 @@ MAINTAINER WireCloud Team <wirecloud@conwet.com>
55
WORKDIR /opt
66

77
RUN apt update && \
8-
apt install -y libmemcached-dev ca-certificates && \
8+
apt install -y libmemcached-dev ca-certificates gosu && \
99
pip install --no-cache-dir social-auth-app-django "gunicorn==19.3.0" "psycopg2==2.6" pylibmc && \
1010
rm -rf /var/lib/apt/lists/* && \
11-
\
12-
export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \
13-
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" && \
14-
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" && \
15-
export GNUPGHOME="$(mktemp -d)" && \
16-
for server in $(shuf -e ha.pool.sks-keyservers.net \
17-
hkp://p80.pool.sks-keyservers.net:80 \
18-
keyserver.ubuntu.com \
19-
hkp://keyserver.ubuntu.com:80 \
20-
pgp.mit.edu) ; do \
21-
gpg --batch --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \
22-
done && \
23-
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
24-
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc && \
25-
chmod +x /usr/local/bin/gosu && \
2611
gosu nobody true
2712

2813
RUN pip install "wirecloud<1.2"

‎1.2/Dockerfile‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,9 @@ ENV DB_HOST=
88
ENV DB_PORT=5432
99

1010
RUN apt-get update && \
11-
apt-get install -y libmemcached-dev && \
11+
apt-get install -y libmemcached-dev gosu && \
1212
pip install --no-cache-dir social-auth-app-django "gunicorn==19.3.0" "psycopg2==2.6" pylibmc pysolr "elasticsearch==2.4.1" && \
1313
rm -rf /var/lib/apt/lists/* && \
14-
\
15-
export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \
16-
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" && \
17-
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" && \
18-
export GNUPGHOME="$(mktemp -d)" && \
19-
for server in $(shuf -e ha.pool.sks-keyservers.net \
20-
hkp://p80.pool.sks-keyservers.net:80 \
21-
keyserver.ubuntu.com \
22-
hkp://keyserver.ubuntu.com:80 \
23-
pgp.mit.edu) ; do \
24-
gpg --batch --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \
25-
done && \
26-
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
27-
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc && \
28-
chmod +x /usr/local/bin/gosu && \
2914
gosu nobody true
3015

3116
# Install WireCloud & dependencies

‎dev/Dockerfile‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,9 @@ ENV FORWARDED_ALLOW_IPS=*
77
ENV DB_PORT=5432
88

99
RUN apt-get update && \
10-
apt-get install -y libmemcached-dev && \
10+
apt-get install -y libmemcached-dev gosu && \
1111
pip install --no-cache-dir social-auth-app-django "gunicorn==19.3.0" "psycopg2==2.6" pylibmc pysolr "elasticsearch==2.4.1" && \
1212
rm -rf /var/lib/apt/lists/* && \
13-
\
14-
export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \
15-
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" && \
16-
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" && \
17-
export GNUPGHOME="$(mktemp -d)" && \
18-
for server in $(shuf -e ha.pool.sks-keyservers.net \
19-
hkp://p80.pool.sks-keyservers.net:80 \
20-
keyserver.ubuntu.com \
21-
hkp://keyserver.ubuntu.com:80 \
22-
pgp.mit.edu) ; do \
23-
gpg --batch --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \
24-
done && \
25-
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
26-
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc && \
27-
chmod +x /usr/local/bin/gosu && \
2813
gosu nobody true
2914

3015
# Install WireCloud & dependencies

0 commit comments

Comments
 (0)