From e8138099cb1b1d4617c14b9fc81753c8b297b810 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sun, 17 Nov 2019 14:48:16 +0100 Subject: [PATCH] Move libressl to basic alpine image --- lxc-apps/ckan/ckan-datapusher.lxcfile | 2 +- lxc-shared/alpine3.8-ruby2.4/lxcfile | 2 +- lxc-shared/alpine3.8/lxcfile | 2 +- lxc-shared/alpine3.9-ruby2.4/lxcfile | 2 +- lxc-shared/alpine3.9-ruby2.6/lxcfile | 2 +- lxc-shared/alpine3.9/lxcfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lxc-apps/ckan/ckan-datapusher.lxcfile b/lxc-apps/ckan/ckan-datapusher.lxcfile index db6a1bc..e9e94a3 100644 --- a/lxc-apps/ckan/ckan-datapusher.lxcfile +++ b/lxc-apps/ckan/ckan-datapusher.lxcfile @@ -5,7 +5,7 @@ LAYER alpine3.9-python2.7_2.7.16-190620 RUN EOF # Install runtime dependencies - apk --no-cache add libffi libressl uwsgi-python + apk --no-cache add libffi uwsgi-python # Install build dependencies apk --no-cache add --virtual .deps build-base git libffi-dev libressl-dev libxml2-dev libxslt-dev py2-pip python2-dev diff --git a/lxc-shared/alpine3.8-ruby2.4/lxcfile b/lxc-shared/alpine3.8-ruby2.4/lxcfile index 893bb75..9992ee4 100644 --- a/lxc-shared/alpine3.8-ruby2.4/lxcfile +++ b/lxc-shared/alpine3.8-ruby2.4/lxcfile @@ -4,7 +4,7 @@ LAYER alpine3.8_3.8.4-190620 RUN EOF # Install Ruby runtime dependencies - apk --no-cache add gdbm libressl readline zlib + apk --no-cache add gdbm readline zlib # Install Ruby build dependencies apk --no-cache add --virtual .deps build-base autoconf gdbm-dev libressl-dev linux-headers readline-dev zlib-dev diff --git a/lxc-shared/alpine3.8/lxcfile b/lxc-shared/alpine3.8/lxcfile index 0696876..19f0865 100644 --- a/lxc-shared/alpine3.8/lxcfile +++ b/lxc-shared/alpine3.8/lxcfile @@ -7,7 +7,7 @@ RUN EOF apk --no-cache upgrade # Install s6 supervisor - apk --no-cache add libxml2 libxslt ncurses-libs s6 + apk --no-cache add libressl libxml2 libxslt ncurses-libs s6 # Cleanup rm -rf /etc/crontabs/root /etc/periodic diff --git a/lxc-shared/alpine3.9-ruby2.4/lxcfile b/lxc-shared/alpine3.9-ruby2.4/lxcfile index a908b1f..d448049 100644 --- a/lxc-shared/alpine3.9-ruby2.4/lxcfile +++ b/lxc-shared/alpine3.9-ruby2.4/lxcfile @@ -4,7 +4,7 @@ LAYER alpine3.9_3.9.4-190620 RUN EOF # Install Ruby runtime dependencies - apk --no-cache add gdbm libressl readline zlib + apk --no-cache add gdbm readline zlib # Install Ruby build dependencies apk --no-cache add --virtual .deps build-base autoconf gdbm-dev libressl-dev linux-headers readline-dev zlib-dev diff --git a/lxc-shared/alpine3.9-ruby2.6/lxcfile b/lxc-shared/alpine3.9-ruby2.6/lxcfile index f7bb12b..dd3c2e8 100644 --- a/lxc-shared/alpine3.9-ruby2.6/lxcfile +++ b/lxc-shared/alpine3.9-ruby2.6/lxcfile @@ -4,7 +4,7 @@ LAYER alpine3.9_3.9.4-190620 RUN EOF # Install Ruby runtime dependencies - apk --no-cache add gdbm libressl readline zlib + apk --no-cache add gdbm readline zlib # Install Ruby build dependencies apk --no-cache add --virtual .deps build-base autoconf gdbm-dev libressl-dev linux-headers readline-dev zlib-dev diff --git a/lxc-shared/alpine3.9/lxcfile b/lxc-shared/alpine3.9/lxcfile index d86f9e6..ad7faaa 100644 --- a/lxc-shared/alpine3.9/lxcfile +++ b/lxc-shared/alpine3.9/lxcfile @@ -8,7 +8,7 @@ RUN EOF apk --no-cache upgrade # Install s6 supervisor - apk --no-cache add libxml2 libxslt ncurses-libs s6 + apk --no-cache add libressl libxml2 libxslt ncurses-libs s6 # Cleanup rm -rf /etc/crontabs/root /etc/periodic