From 45acc4585347d5f8107585ed741f5c723d72edc1 Mon Sep 17 00:00:00 2001 From: Stewart Henderson Date: Fri, 18 Oct 2019 10:19:02 -0500 Subject: [PATCH] Security request to unpin Alpine packages. --- Dockerfile.base | 2 +- etc/alpine-packages | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Dockerfile.base b/Dockerfile.base index f02a6df..8cc6aa3 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -15,7 +15,7 @@ COPY automation_requirements.txt /base COPY src/app_requirements.txt /base COPY src/test_requirements.txt /base -RUN apk add bash==5.0.0-r0 && \ +RUN apk add bash && \ bin/install-packages.sh && \ pip3 install -r automation_requirements.txt && \ pip3 install -r app_requirements.txt && \ diff --git a/etc/alpine-packages b/etc/alpine-packages index e48c195..2368cb1 100644 --- a/etc/alpine-packages +++ b/etc/alpine-packages @@ -1,18 +1,16 @@ -build-base==0.5-r1 -libgit2-dev==0.28.2-r0 -libc-dev==0.7.1-r0 +build-base +libgit2-dev +libc-dev python3-dev -libffi-dev==3.2.1-r6 -zeromq-dev==4.3.2-r1 -linux-headers==4.19.36-r0 -openssl-dev==1.1.1d-r0 +libffi-dev +zeromq-dev +linux-headers +openssl-dev nodejs -curl==7.66.0-r0 -yarn==1.16.0-r0 -gcc==8.3.0-r0 -g++==8.3.0-r0 -musl-dev==1.1.22-r3 +curl +yarn +gcc +g++ +musl-dev pkgconfig -git==2.22.0-r0 -graphviz-dev==2.40.1-r1 -graphviz==2.40.1-r1 +git \ No newline at end of file