SL-XX: updates to dockerfiles for extended images (#558)

blindsidenetworks · May 14, 2021 · d822970 · d822970
1 parent b2125e7
commit d822970
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/dockerfiles/v1/bionic230-alpine b/dockerfiles/v1/bionic230-alpine
@@ -38,6 +38,8 @@ ENV NGINX_HOSTNAME=localhost
 CMD [ "/etc/nginx/start", "-g", "daemon off;" ]
 
 FROM alpine AS base
+RUN apk add --no-cache \
+    libpq
 RUN apk add --no-cache \
     libpq \
     libxml2 \

diff --git a/dockerfiles/v1/bionic230-amazonlinux b/dockerfiles/v1/bionic230-amazonlinux
@@ -20,14 +20,16 @@ RUN apt-get update \
     && apt-get download bbb-playback bbb-playback-presentation \
     && dpkg -i --force-depends *.deb
 
-FROM amazonlinux AS nginx
-RUN yes | amazon-linux-extras install nginx1
+FROM amazonlinux AS amazonlinux-base
 ENV TINI_VERSION v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc /tini.asc
-RUN gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
- && gpg --batch --verify /tini.asc /sbin/tini
+RUN gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7
+RUN gpg --batch --verify /tini.asc /sbin/tini
 RUN chmod +x /sbin/tini
+
+FROM amazonlinux-base AS nginx
+RUN yes | amazon-linux-extras install nginx1
 RUN yum -y install gettext
 RUN ln -sf /dev/stdout /var/log/nginx/access.log
 RUN ln -sf /dev/stderr /var/log/nginx/error.log
@@ -41,13 +43,7 @@ EXPOSE 443
 ENV NGINX_HOSTNAME=localhost
 CMD [ "/etc/nginx/start", "-g", "daemon off;" ]
 
-FROM amazonlinux AS base
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc /tini.asc
-RUN gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
- && gpg --batch --verify /tini.asc /sbin/tini
-RUN chmod +x /sbin/tini
+FROM amazonlinux-base AS base
 # Install Node.js (needed for yarn)
 RUN curl -sL https://rpm.nodesource.com/setup_10.x | bash -
 RUN yum -y install nodejs gcc-c++ make