From 477d5f550316b7530643a4bf0890fc143b01043b Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Mon, 24 Jun 2019 19:24:22 -0700 Subject: [PATCH] Update to use frolvlad/alpine-glibc image --- .../alpine-3.10-git/.devcontainer/Dockerfile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/containers/alpine-3.10-git/.devcontainer/Dockerfile b/containers/alpine-3.10-git/.devcontainer/Dockerfile index c585bc0c45..01489ecc1a 100644 --- a/containers/alpine-3.10-git/.devcontainer/Dockerfile +++ b/containers/alpine-3.10-git/.devcontainer/Dockerfile @@ -2,16 +2,8 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -FROM alpine:3.10 +# This image includes glibc. Change to FROM alpine:3.10 if you don't need glibc. +FROM frolvlad/alpine-glibc:alpine-3.10 -ARG GLIBC_VERSION=2.29-r0 - -RUN apk add --no-cache -q git \ - # - # Install glibc compatibility from https://github.com/sgerrand/alpine-pkg-glibc - # This is optional, but increases odds of extensions working - && apk add --no-cache ca-certificates wget libstdc++ libgcc \ - && wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \ - && wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \ - && apk add --no-cache glibc-${GLIBC_VERSION}.apk \ - && rm glibc-${GLIBC_VERSION}.apk +# Install dependencies, git, and bash +RUN apk add --no-cache libstdc++ libgcc git bash