diff --git a/Dockerfile b/Dockerfile index 490ec33..0f1ba69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,11 @@ MAINTAINER Justin Wong RUN apt-get update && \ apt-get install -y wget curl rsync lftp git jq python3-dev python3-pip yum-utils createrepo aria2 ack composer php-curl php-zip libnss-unknown -RUN pip3 install --upgrade pip +RUN if [ "$(uname -m)" != "x86_64" -a "$(uname -m)" != "i386" ]; then \ + apt-get install -y libxml2-dev libxslt1-dev zlib1g-dev libssl-dev libffi-dev ;\ + fi + +RUN pip3 install --upgrade pip RUN STATIC_DEPS=true python3 -m pip install pyquery RUN python3 -m pip install requests[socks] pyyaml gsutil awscli diff --git a/dockerfiles/nix-channels/Dockerfile b/dockerfiles/nix-channels/Dockerfile index 7069cdd..f7e7dac 100644 --- a/dockerfiles/nix-channels/Dockerfile +++ b/dockerfiles/nix-channels/Dockerfile @@ -2,17 +2,19 @@ FROM debian:buster MAINTAINER Wang Ruikang RUN apt-get update && \ - apt-get install -y python3-dev python3-pip curl && \ - pip3 install pyquery requests minio==6.0.2 && \ + apt-get install -y python3-dev python3-pip curl +RUN if [ "$(uname -m)" != "x86_64" -a "$(uname -m)" != "i386" ]; then \ + apt-get install -y libxml2-dev libxslt1-dev zlib1g-dev ;\ + fi +RUN pip3 install pyquery requests minio==6.0.2 # Install Nix. To simplify management we only copy binaries and create # symlinks, and do no further configuration - curl https://mirrors.tuna.tsinghua.edu.cn/nix/nix-2.3.2/nix-2.3.2-x86_64-linux.tar.xz -o /tmp/nix.tar.xz && \ - mkdir /tmp/nix.unpack && \ - tar xpf /tmp/nix.tar.xz -C /tmp/nix.unpack && \ +RUN mkdir -p /tmp/nix.unpack && \ + curl -L https://mirrors.tuna.tsinghua.edu.cn/nix/nix-2.3.2/nix-2.3.2-x86_64-linux.tar.xz | tar -xpJ -C /tmp/nix.unpack && \ mkdir /nix && \ cp -dpr /tmp/nix.unpack/*/store /nix/store && \ ln -s /nix/store/*-nix-*/bin/* /usr/local/bin && \ - rm -rf /tmp/nix.tar.xz /tmp/nix.unpack + rm -rf /tmp/nix.unpack ENV HOME=/tmp CMD /bin/bash diff --git a/dockerfiles/rubygems/Dockerfile b/dockerfiles/rubygems/Dockerfile index 7335211..563faba 100644 --- a/dockerfiles/rubygems/Dockerfile +++ b/dockerfiles/rubygems/Dockerfile @@ -1,4 +1,4 @@ -FROM cybercode/alpine-ruby:2.3 +FROM ruby:2.7-alpine RUN gem install rubygems-mirror ENV BUSYBOX=1 ENV HOME=/tmp