diff --git a/Dockerfile b/Dockerfile index 55a105acb177ddf560efb9afc7a78023bade78e7..16a229da4e2cafc7b36470b1c3394aaea5d4a329 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive WORKDIR /opt/tor-reproducer -ADD install*.sh ./ -RUN ./install.sh - ADD prepare_tor_macos.sh ./ ADD prepare_docker_in_docker.sh ./ ADD build_tor_macos.py ./ diff --git a/install-dependencies-verification.sh b/install-dependencies-verification.sh deleted file mode 100755 index ebc51accbef453016d0064a4e461ae831b5137c4..0000000000000000000000000000000000000000 --- a/install-dependencies-verification.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -e -set -x - -apt-get install -y --no-install-recommends \ - python3-pip python3-setuptools python3-wheel \ - python3-libarchive-c \ - libmagic1 - -# Install latest diffoscope (version in Debian stable is outdated) -pip3 install diffoscope diff --git a/install-dependencies.sh b/install-dependencies.sh deleted file mode 100755 index 6403c1a557caa2234c17c556feeb89d18f342a58..0000000000000000000000000000000000000000 --- a/install-dependencies.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash -set -e -set -x - -apt-get install -y --no-install-recommends \ - git \ - vim `# just for live debugging` \ - wget \ - gpg \ - zip \ - software-properties-common \ - libyaml-libyaml-perl \ - libtemplate-perl \ - libdatetime-perl \ - libio-handle-util-perl \ - libio-all-perl \ - libio-captureoutput-perl \ - libjson-perl \ - libpath-tiny-perl \ - libstring-shellquote-perl \ - libsort-versions-perl \ - libdigest-sha-perl \ - libdata-uuid-perl \ - libdata-dump-perl \ - libfile-copy-recursive-perl \ - libfile-slurp-perl \ - mercurial \ - uidmap \ - fastjar - -# unzip \ -# build-essential \ -# make \ -# patch \ -# pkg-config \ -# autopoint \ -# libtool \ -# automake \ -# binutils-multiarch \ -# perl \ -# po4a diff --git a/install.sh b/install.sh deleted file mode 100755 index 4a6fab34348b40728d9e07f4ced453a1b48c70a4..0000000000000000000000000000000000000000 --- a/install.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -set -e -set -x - -# update package sources -apt-get update -apt-get -y upgrade - -# do not install documentation to keep image small -echo "path-exclude=/usr/share/locale/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc -echo "path-exclude=/usr/share/man/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc -echo "path-exclude=/usr/share/doc/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc - -# install dependencies -./install-dependencies.sh -./install-dependencies-verification.sh - -# clean up for smaller image size -apt-get -y autoremove --purge -apt-get clean -rm -rf /var/lib/apt/lists/*